From 1c830108ad42d8ba7ffbe1ec72059d00ba254566 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 1 Mar 2013 16:38:39 -0500 Subject: [PATCH] misinterpreted the meaning of the "trust address" flag --- daemon/call.c | 2 +- daemon/sdp.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index 6ba988989..2495b4da2 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2203,7 +2203,7 @@ static void call_ng_process_flags(struct sdp_ng_flags *out, GQueue *streams, ben if ((list = bencode_dictionary_get_expect(input, "flags", BENCODE_LIST))) { for (it = list->child; it; it = it->sibling) { if (!bencode_strcmp(it, "trust-address")) - out->trust_address = 1; + out->trust_address = 1; /* XXX support this somehow */ else if (!bencode_strcmp(it, "symmetric")) out->symmetric = 1; else if (!bencode_strcmp(it, "asymmetric")) diff --git a/daemon/sdp.c b/daemon/sdp.c index 15b7a64a3..fb6df9d80 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -737,13 +737,8 @@ static int insert_ice_address(struct sdp_chopper *chop, struct sdp_ng_flags *fla char buf[64]; int len; - if (!flags->trust_address && flags->received_from_family.len == 3 && flags->received_from_address.len) - chopper_append_str(chop, &flags->received_from_address); - else { - call_stream_address(buf, sr->up, SAF_ICE, &len); - chopper_append_dup(chop, buf, len); - } - + call_stream_address(buf, sr->up, SAF_ICE, &len); + chopper_append_dup(chop, buf, len); chopper_append_printf(chop, " %hu", sr->fd.localport); return 0; @@ -758,15 +753,8 @@ static int replace_network_address(struct sdp_chopper *chop, struct network_addr if (copy_up_to(chop, &address->address_type)) return -1; - if (!flags->trust_address && flags->received_from_family.len == 3 && flags->received_from_address.len) { - chopper_append_str(chop, &flags->received_from_family); - chopper_append_c(chop, " "); - chopper_append_str(chop, &flags->received_from_address); - } - else { - call_stream_address(buf, sr->up, SAF_NG, &len); - chopper_append_dup(chop, buf, len); - } + call_stream_address(buf, sr->up, SAF_NG, &len); + chopper_append_dup(chop, buf, len); if (skip_over(chop, &address->address)) return -1;