.

Author: murillo128

libavformat/whip.c

@@ -42,7 +42,6 @@
 #include "network.h"
 #include "srtp.h"
 #include "tls.h"
-#include <errno.h>
 /**
  * Maximum size limit of a Session Description Protocol (SDP),
  * be it an offer or answer.
@@ -162,11 +161,9 @@
 /* STUN Attribute, comprehension-required range (0x0000-0x7FFF) */
 enum STUNAttr {
     STUN_ATTR_USERNAME                  = 0x0006, /// shared secret response/bind request
-    STUN_ATTR_PRIORITY                  = 0x0024, /// ICE controlling/controlled
     STUN_ATTR_USE_CANDIDATE             = 0x0025, /// bind request
     STUN_ATTR_MESSAGE_INTEGRITY         = 0x0008, /// bind request/response
     STUN_ATTR_FINGERPRINT               = 0x8028, /// rfc5389
-    STUN_ATTR_ICE_CONTROLLING           = 0x802A, /// full agent talking to ice-lite
 };
 
 enum WHIPState {
@@ -316,10 +313,6 @@ typedef struct WHIPContext {
     int consent_interval;
     int64_t last_consent_tx;
     int consent_failures;
-
-    /* ICE-lite support */
-    int ice_lite_remote;
-    uint64_t  ice_tie_breaker;   /* random 64-bit, for ICE-CONTROLLING    */
 } WHIPContext;
 
 /**
@@ -429,9 +422,6 @@ static av_cold int initialize(AVFormatContext *s)
     seed = av_get_random_seed();
     av_lfg_init(&whip->rnd, seed);
 
-    /* 64-bit tie-breaker for ICE-CONTROLLING (RFC 8445 6.1.1) */
-    whip->ice_tie_breaker = ((uint64_t)av_lfg_get(&whip->rnd) << 32) | (uint64_t)av_lfg_get(&whip->rnd);
-
     /* Initialise consent-freshness timers */
     if (whip->consent_interval <= 0)
         whip->consent_interval = WHIP_CONSENT_DEF_INTERVAL;
@@ -920,8 +910,6 @@ static int parse_answer(AVFormatContext *s)
                     goto end;
                 }
             }
-        } else if (av_strstart(line, "a=ice-lite", NULL)) {
-            whip->ice_lite_remote = 1;
         }
     }
 
@@ -1013,21 +1001,6 @@ static int ice_create_request(AVFormatContext *s, uint8_t *buf, int buf_size, in
     avio_wb16(pb, STUN_ATTR_USE_CANDIDATE); /* attribute type use-candidate */
     avio_wb16(pb, 0); /* size of use-candidate */
 
-    /**
-     * For ICE-lite peers we are *always* the controlling agent (RFC 8445 6.1.3.1).
-     * Add PRIORITY + ICE-CONTROLLING attributes.
-     */
-     if (whip->ice_lite_remote) {
-        /* we are controlling, use host-candidate priority 126 << 24 | 65535 << 8 | 255 = 2130706431 */
-        avio_wb16(pb, STUN_ATTR_PRIORITY);
-        avio_wb16(pb, 4);
-        avio_wb32(pb, 2130706431);
-            
-        avio_wb16(pb, STUN_ATTR_ICE_CONTROLLING);
-        avio_wb16(pb, 8);
-        avio_wb32(pb, (uint32_t)(whip->ice_tie_breaker >> 32));
-        avio_wb32(pb, (uint32_t)(whip->ice_tie_breaker & 0xffffffff));
-    }
 
     /* Build and update message integrity */
     avio_wb16(pb, STUN_ATTR_MESSAGE_INTEGRITY); /* attribute type message integrity */