forwardport [17646] (SDP source-filter fix)

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 709fea4a11884d5729bb1d232fe3885357516969..033cf7307fea22c1f26f6646ade5b3458dbce74b 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -292,8 +292,8 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
                    "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
             if( IN6_IS_ADDR_MULTICAST( a6 ) )
             {
-                /* force flags to zero, preserve scope */
-                a6->s6_addr[1] &= 0xf;
+                /* force reserved bits in flags to zero, preserve scope */
+                a6->s6_addr[1] &= 0x3f;
 
                 /* SSM <=> ff3x::/32 */
                 b_ssm = (GetDWLE (a6->s6_addr) & 0xfff0ffff) == 0xff300000;
@@ -330,10 +330,9 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
             else
             /* other addresses => 224.2.127.254 */
             {
-                ipv4 = 0xe0027ffe;
-
                 /* SSM: 232.0.0.0/8 */
                 b_ssm = (ipv4 >> 24) == 232;
+                ipv4 = 0xe0027ffe;
             }
 
             if( ipv4 == 0 )