sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#78900 leave m=message connection details untouched

Browse Source 
closes #959

Change-Id: Iaf01c87697ce46f507563ed1560e664b0ca33544
changes/49/39249/4
Richard Fuchs 6 years ago
parent 35899ec27b
commit dfc76d23b5
3 changed files with 161 additions and 2 deletions
Show Stats Download Patch File Download Diff File

44
daemon/sdp.c
Unescape View File

@ -35,6 +35,7 @@ struct sdp_origin {
};
struct sdp_connection {
str s;
struct network_address address;
int parsed:1;
};
@ -69,6 +70,7 @@ struct sdp_media {
int port_count;
struct sdp_connection connection;
const char *c_line_pos;
int rr, rs;
struct sdp_attributes attributes;
GQueue format_list; /* list of slice-alloc'd str objects */
@ -348,6 +350,8 @@ static int parse_connection(str *value_str, struct sdp_connection *output) {
if (output->parsed)
return -1;
output->s = *value_str;
EXTRACT_NETWORK_ADDRESS(address);
output->parsed = 1;
@ -1090,6 +1094,9 @@ new_session:
break;
case 'm':
if (media && !media->c_line_pos)
media->c_line_pos = b;
media = g_slice_alloc0(sizeof(*media));
media->session = session;
attrs_init(&media->attributes);
@ -1111,6 +1118,9 @@ new_session:
break;
case 'a':
if (media && !media->c_line_pos)
media->c_line_pos = b;
attr = g_slice_alloc0(sizeof(*attr));
attr->full_line.s = b;
@ -1140,6 +1150,9 @@ new_session:
break;
case 'b':
if (media && !media->c_line_pos)
media->c_line_pos = b;
/* RR:0 */
if (line_end - value < 4)
break;
@ -1151,6 +1164,11 @@ new_session:
(line_end - value == 4 && value[3] == '0') ? 0 : 1;
break;
case 'k':
if (media && !media->c_line_pos)
media->c_line_pos = b;
break;
case 's':
case 'i':
case 'u':
@ -1159,7 +1177,6 @@ new_session:
case 't':
case 'r':
case 'z':
case 'k':
break;
default:
@ -1839,6 +1856,22 @@ static int replace_network_address(struct sdp_chopper *chop, struct network_addr
return 0;
}
static int synth_session_connection(struct sdp_chopper *chop, struct sdp_media *sdp_media) {
if (!sdp_media->session->connection.s.s)
return -1;
if (sdp_media->c_line_pos)
copy_up_to_ptr(chop, sdp_media->c_line_pos);
else
copy_up_to_end_of(chop, chop->input);
chopper_append_c(chop, "c=");
chopper_append_str(chop, &sdp_media->session->connection.s);
chopper_append_c(chop, "\n");
return 0;
}
void sdp_chopper_destroy(struct sdp_chopper *chop) {
g_string_free(chop->output, TRUE);
g_slice_free1(sizeof(*chop), chop);
@ -2318,7 +2351,7 @@ int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call_monologu
goto error;
ps = j->data;
if (!flags->ice_force_relay) {
if (!flags->ice_force_relay && call_media->type_id != MT_MESSAGE) {
if (replace_media_type(chop, sdp_media, call_media))
goto error;
if (replace_media_port(chop, sdp_media, ps))
@ -2336,6 +2369,13 @@ int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call_monologu
goto error;
}
}
else if (call_media->type_id == MT_MESSAGE) {
if (!sdp_media->connection.parsed)
if (synth_session_connection(chop, sdp_media))
goto error;
// leave everything untouched
goto next;
}
if (process_media_attributes(chop, sdp_media, flags, call_media))
goto error;

3
lib/codeclib.h
Unescape View File

@ -12,6 +12,7 @@ enum media_type {
MT_AUDIO,
MT_VIDEO,
MT_IMAGE,
MT_MESSAGE,
MT_OTHER,
};
@ -27,6 +28,8 @@ INLINE enum media_type codec_get_type(const str *type) {
return MT_VIDEO;
if (!str_cmp(type, "image"))
return MT_IMAGE;
if (!str_cmp(type, "message"))
return MT_MESSAGE;
return MT_OTHER;
}

116
t/auto-daemon-tests.pl
Unescape View File

@ -543,6 +543,122 @@ rcv($sock_a, $port_b, rtpm(0, 2000, 4000, 0x3456, "\x00" x 160));
# MSRP (GH 959)
new_call();
offer('gh 959 media c=', { ICE => 'remove', }, <<SDP);
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 1.2.3.4
t=0 0
m=audio 27998 RTP/AVP 96
a=rtpmap:96 opus/48000/2
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
a=setup:active
----------------------------------
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 203.0.113.1
t=0 0
m=audio PORT RTP/AVP 96
a=rtpmap:96 opus/48000/2
a=sendrecv
a=rtcp:PORT
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
a=setup:active
SDP
new_call();
offer('gh 959 media c= no session c=', { ICE => 'remove', }, <<SDP);
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
t=0 0
m=audio 27998 RTP/AVP 96
c=IN IP4 1.2.3.4
a=rtpmap:96 opus/48000/2
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
a=setup:active
----------------------------------
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
t=0 0
m=audio PORT RTP/AVP 96
c=IN IP4 203.0.113.1
a=rtpmap:96 opus/48000/2
a=sendrecv
a=rtcp:PORT
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
a=setup:active
SDP
new_call();
offer('gh 959 session c=', { ICE => 'remove', }, <<SDP);
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 1.2.3.4
t=0 0
m=audio 27998 RTP/AVP 96
a=rtpmap:96 opus/48000/2
m=message 28000 TCP/MSRP *
a=setup:active
----------------------------------
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 203.0.113.1
t=0 0
m=audio PORT RTP/AVP 96
a=rtpmap:96 opus/48000/2
a=sendrecv
a=rtcp:PORT
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
a=setup:active
SDP
new_call();
offer('gh 959 session c= no attrs', { ICE => 'remove', }, <<SDP);
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 1.2.3.4
t=0 0
m=audio 27998 RTP/AVP 96
a=rtpmap:96 opus/48000/2
m=message 28000 TCP/MSRP *
----------------------------------
v=0
o=- 1822058533 1822058533 IN IP4 1.2.3.4
s=Asterisk
c=IN IP4 203.0.113.1
t=0 0
m=audio PORT RTP/AVP 96
a=rtpmap:96 opus/48000/2
a=sendrecv
a=rtcp:PORT
m=message 28000 TCP/MSRP *
c=IN IP4 1.2.3.4
SDP
# SDES key lifetime
new_call();

Write Preview
Loading…
Cancel
Save