RuhNetConsulting
/
rtpengine
mirror of https://github.com/sipwise/rtpengine
1
1
Fork 0
Code Issues 0 Projects 0 Releases 822 Wiki Activity
Browse Source

honour media-address= also for ICE and RTCP 

closes #1039

Change-Id: Icb75875757eecfc02100dacb16d70532ed6be7ec
changes/47/41847/1
Richard Fuchs 5 years ago
parent
112e57f9fe
commit
de37041ad9
2 changed files with 68 additions and 14 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +29
    -14
      daemon/sdp.c
  2. +39
    -0
      t/auto-daemon-tests.pl

+ 29
- 14
daemon/sdp.c View File

@ -1800,23 +1800,31 @@ warn:
return 0;
}
static int insert_ice_address(struct sdp_chopper *chop, struct stream_fd *sfd) {
static int insert_ice_address(struct sdp_chopper *chop, struct stream_fd *sfd, struct sdp_ng_flags *flags) {
char buf[64];
int len;
call_stream_address46(buf, sfd->stream, SAF_ICE, &len, sfd->local_intf, 0);
if (!is_addr_unspecified(&flags->parsed_media_address))
len = sprintf(buf, "%s",
sockaddr_print_buf(&flags->parsed_media_address));
else
call_stream_address46(buf, sfd->stream, SAF_ICE, &len, sfd->local_intf, 0);
chopper_append(chop, buf, len);
chopper_append_printf(chop, " %u", sfd->socket.local.port);
return 0;
}
static int insert_raddr_rport(struct sdp_chopper *chop, struct stream_fd *sfd) {
static int insert_raddr_rport(struct sdp_chopper *chop, struct stream_fd *sfd, struct sdp_ng_flags *flags) {
char buf[64];
int len;
chopper_append_c(chop, " raddr ");
call_stream_address46(buf, sfd->stream, SAF_ICE, &len, sfd->local_intf, 0);
if (!is_addr_unspecified(&flags->parsed_media_address))
len = sprintf(buf, "%s",
sockaddr_print_buf(&flags->parsed_media_address));
else
call_stream_address46(buf, sfd->stream, SAF_ICE, &len, sfd->local_intf, 0);
chopper_append(chop, buf, len);
chopper_append_c(chop, " rport ");
chopper_append_printf(chop, "%u", sfd->socket.local.port);
@ -2080,7 +2088,8 @@ out:
}
static void insert_candidate(struct sdp_chopper *chop, struct stream_fd *sfd,
unsigned int type_pref, unsigned int local_pref, enum ice_candidate_type type)
unsigned int type_pref, unsigned int local_pref, enum ice_candidate_type type,
struct sdp_ng_flags *flags)
{
unsigned long priority;
struct packet_stream *ps = sfd->stream;
@ -2093,24 +2102,25 @@ static void insert_candidate(struct sdp_chopper *chop, struct stream_fd *sfd,
chopper_append_c(chop, "a=candidate:");
chopper_append_str(chop, &ifa->ice_foundation);
chopper_append_printf(chop, " %u UDP %lu ", ps->component, priority);
insert_ice_address(chop, sfd);
insert_ice_address(chop, sfd, flags);
chopper_append_c(chop, " typ ");
chopper_append_c(chop, ice_candidate_type_str(type));
/* raddr and rport are required for non-host candidates: rfc5245 section-15.1 */
if(type != ICT_HOST)
insert_raddr_rport(chop, sfd);
insert_raddr_rport(chop, sfd, flags);
chopper_append_c(chop, "\r\n");
}
static void insert_sfd_candidates(struct sdp_chopper *chop, struct packet_stream *ps,
unsigned int type_pref, unsigned int local_pref, enum ice_candidate_type type)
unsigned int type_pref, unsigned int local_pref, enum ice_candidate_type type,
struct sdp_ng_flags *flags)
{
GList *l;
struct stream_fd *sfd;
for (l = ps->sfds.head; l; l = l->next) {
sfd = l->data;
insert_candidate(chop, sfd, type_pref, local_pref, type);
insert_candidate(chop, sfd, type_pref, local_pref, type, flags);
if (local_pref != -1)
local_pref++;
@ -2143,9 +2153,9 @@ static void insert_candidates(struct sdp_chopper *chop, struct packet_stream *rt
if (ag && AGENT_ISSET(ag, COMPLETED)) {
ifa = rtp->selected_sfd->local_intf;
insert_candidate(chop, rtp->selected_sfd, type_pref, ifa->unique_id, cand_type);
insert_candidate(chop, rtp->selected_sfd, type_pref, ifa->unique_id, cand_type, flags);
if (rtcp) /* rtcp-mux only possible in answer */
insert_candidate(chop, rtcp->selected_sfd, type_pref, ifa->unique_id, cand_type);
insert_candidate(chop, rtcp->selected_sfd, type_pref, ifa->unique_id, cand_type, flags);
if (flags->opmode == OP_OFFER && AGENT_ISSET(ag, CONTROLLING)) {
GQueue rc;
@ -2165,10 +2175,10 @@ static void insert_candidates(struct sdp_chopper *chop, struct packet_stream *rt
return;
}
insert_sfd_candidates(chop, rtp, type_pref, local_pref, cand_type);
insert_sfd_candidates(chop, rtp, type_pref, local_pref, cand_type, flags);
if (rtcp) /* rtcp-mux only possible in answer */
insert_sfd_candidates(chop, rtcp, type_pref, local_pref, cand_type);
insert_sfd_candidates(chop, rtcp, type_pref, local_pref, cand_type, flags);
}
static void insert_dtls(struct call_media *media, struct sdp_chopper *chop) {
@ -2268,7 +2278,12 @@ static void insert_rtcp_attr(struct sdp_chopper *chop, struct packet_stream *ps,
if (flags->full_rtcp_attr) {
char buf[64];
int len;
call_stream_address46(buf, ps, SAF_NG, &len, NULL, 0);
if (!is_addr_unspecified(&flags->parsed_media_address))
len = sprintf(buf, "%s %s",
flags->parsed_media_address.family->rfc_name,
sockaddr_print_buf(&flags->parsed_media_address));
else
call_stream_address46(buf, ps, SAF_NG, &len, NULL, 0);
chopper_append_printf(chop, " IN %.*s", len, buf);
}
chopper_append_c(chop, "\r\n");


+ 39
- 0
t/auto-daemon-tests.pl View File

@ -3925,6 +3925,45 @@ SDP
new_call;
offer('ICE SDP, default ICE option w media-address', { 'media-address' => '3.4.5.6',
flags => ['full-rtcp-attribute'], }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.1
s=tester
t=0 0
m=audio 2000 RTP/AVP 0
c=IN IP4 198.51.100.1
a=sendrecv
a=ice-ufrag:asbsdfds
a=ice-pwd:sfhwsrgyergws45ujhsrthsrhH
a=candidate:sfthqw45hdfgdfsb 1 UDP 2130706431 198.51.100.3 2002 typ host
a=candidate:ujksdfghfdfgdfsb 1 UDP 2130706175 2001:db8:abcd::3 2002 typ host
a=candidate:sfthqw45hdfgdfsb 2 UDP 2130706430 198.51.100.3 2003 typ host
a=candidate:ujksdfghfdfgdfsb 2 UDP 2130706174 2001:db8:abcd::3 2003 typ host
----------------------------
v=0
o=- 1545997027 1 IN IP4 198.51.100.1
s=tester
t=0 0
m=audio PORT RTP/AVP 0
c=IN IP4 3.4.5.6
a=ice-ufrag:asbsdfds
a=ice-pwd:sfhwsrgyergws45ujhsrthsrhH
a=candidate:sfthqw45hdfgdfsb 1 UDP 2130706431 198.51.100.3 2002 typ host
a=candidate:ujksdfghfdfgdfsb 1 UDP 2130706175 2001:db8:abcd::3 2002 typ host
a=candidate:sfthqw45hdfgdfsb 2 UDP 2130706430 198.51.100.3 2003 typ host
a=candidate:ujksdfghfdfgdfsb 2 UDP 2130706174 2001:db8:abcd::3 2003 typ host
a=rtpmap:0 PCMU/8000
a=sendrecv
a=rtcp:PORT IN IP4 3.4.5.6
a=candidate:ICEBASE 1 UDP 2097152255 3.4.5.6 PORT typ host
a=candidate:ICEBASE 1 UDP 4294967295 3.4.5.6 PORT typ host
a=candidate:ICEBASE 2 UDP 2097152254 3.4.5.6 PORT typ host
a=candidate:ICEBASE 2 UDP 4294967294 3.4.5.6 PORT typ host
SDP
new_call;
offer('ICE SDP, default ICE option', { }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.1


Write Preview
Loading…
Cancel
Save