Merge pull request #264 from etamme/mediaproxy-rfc5245fix

fix for RFC5245 15.1 compliant candidate injection
OpenSIPS · Jan 6, 2015 · 06309a1 · 06309a1
2 parents 3505ae4 + d930f92
commit 06309a1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c
@@ -1715,11 +1715,13 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da
             unsigned int priority = (ice_data == NULL)?get_ice_candidate_priority(priority_str):ice_data->priority;
             port = strtoint(&tokens[j]);
             candidate.s = buf;
-            candidate.len = sprintf(candidate.s, "a=candidate:R%x 1 UDP %u %.*s %i typ relay%.*s",
+            candidate.len = sprintf(candidate.s, "a=candidate:R%x 1 UDP %u %.*s %i typ relay raddr %.*s rport %i%.*s",
                                     hexip.s_addr,
                                     priority,
                                     tokens[0].len, tokens[0].s,
                                     port,
+                                    tokens[0].len, tokens[0].s,
+                                    port,
                                     session.separator.len, session.separator.s);
 
             if (!insert_element(msg, stream.first_ice_candidate, candidate.s)) {
@@ -1729,11 +1731,13 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da
 
             if (stream.has_rtcp_ice) {
                 candidate.s = buf;
-                candidate.len = sprintf(candidate.s, "a=candidate:R%x 2 UDP %u %.*s %i typ relay%.*s",
+                candidate.len = sprintf(candidate.s, "a=candidate:R%x 2 UDP %u %.*s %i typ relay raddr %.*s rport %i%.*s",
                                         hexip.s_addr,
                                         priority-1,
                                         tokens[0].len, tokens[0].s,
                                         port+1,
+                                        tokens[0].len, tokens[0].s,
+                                        port+1,
                                         session.separator.len, session.separator.s);
 
                 if (!insert_element(msg, stream.first_ice_candidate, candidate.s)) {