sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: parser/sdp: added check on body length when looking for 'a= candidate:'

by Juha Heinanen

Module: sip-router Branch: master Commit: ddfbbd7c0eb7fc1c7ffbb07d6260271ded8b42b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddfbbd7… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Dec 31 18:18:05 2012 +0200 parser/sdp: added check on body length when looking for 'a=candidate:' --- parser/sdp/sdp_helpr_funcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 0b04530..a9eb315 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -343,7 +343,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) int len, fl; sdp_ice_attr_t *ice_attr; - if (strncasecmp(body->s, "a=candidate:", 12) != 0) { + if ((body->len < 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ return -1; }

11 years, 10 months

git:master: parser/sdp: added 'a:remote-candidates' media stream attribute

by Juha Heinanen

Module: sip-router Branch: master Commit: 88a8eb348359f05a1ff14371f8e323cf086d6497 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88a8eb3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Dec 31 18:16:23 2012 +0200 parser/sdp: added 'a:remote-candidates' media stream attribute --- parser/sdp/sdp.c | 9 +++++++-- parser/sdp/sdp.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index ab04d60..93440bf 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -369,6 +369,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ sdp_payload_attr_t *payload_attr; int parse_payload_attr; str fmtp_string; + str remote_candidates = {"a:remote-candidates:", 20}; /* hook the start and lenght of sdp body inside structure * - shorcut useful for multi-part bodies and sdp operations @@ -553,6 +554,9 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ set_sdp_payload_fmtp(payload_attr, &fmtp_string); } else if (parse_payload_attr && extract_candidate(&tmpstr1, stream) == 0) { a1p += 2; + } else if (parse_payload_attr && extract_field(&tmpstr1, &stream->remote_candidates, + remote_candidates) == 0) { + a1p += 2; } else if (extract_accept_types(&tmpstr1, &stream->accept_types) == 0) { a1p = stream->accept_types.s + stream->accept_types.len; } else if (extract_accept_wrapped_types(&tmpstr1, &stream->accept_wrapped_types) == 0) { @@ -822,7 +826,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) sdp_payload_attr_t *payload; sdp_ice_attr_t *ice_attr; - LOG(log_level , "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LOG(log_level , "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, @@ -838,7 +842,8 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) stream->path.len, stream->path.s, stream->max_size.len, stream->max_size.s, stream->accept_types.len, stream->accept_types.s, - stream->accept_wrapped_types.len, stream->accept_wrapped_types.s); + stream->accept_wrapped_types.len, stream->accept_wrapped_types.s, + stream->remote_candidates.len, stream->remote_candidates.s); payload = stream->payload_attr; while (payload) { LOG(log_level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index dc0dede..550a2d3 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -86,6 +86,7 @@ typedef struct sdp_stream_cell { int ice_attrs_num; /**< number of ICE attrs inside a stream */ /* add fast access pointers to ice attributes if you need them */ sdp_ice_attr_t *ice_attr; + str remote_candidates; /**< ICE a:remote-candidates */ } sdp_stream_cell_t; typedef struct sdp_session_cell {

11 years, 10 months

git:master: pkg/kamailio/(centos|fedora): Added IMS modules to RPM builds

by Peter Dunkley

Module: sip-router Branch: master Commit: 945b1fd62e1bb5c9d4aa066666d64ae63731c94a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=945b1fd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 16:08:20 2012 +0000 pkg/kamailio/(centos|fedora): Added IMS modules to RPM builds --- pkg/kamailio/centos/6/kamailio-build.appl | 2 +- pkg/kamailio/centos/6/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio-build.appl | 2 +- pkg/kamailio/fedora/16/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio.spec | 35 ++++++++++++++++++++++++++++ pkg/kamailio/fedora/17/kamailio-build.appl | 2 +- pkg/kamailio/fedora/17/kamailio.appl | 2 +- 7 files changed, 41 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index e83d845..2d378fc 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -22,7 +22,7 @@ packages: - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - libunistring-devel # kamailio-websocket - - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools-devel # kamailio - lua-devel # kamailio-lua - make # kamailio diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl index 8f79cc6..f8e175b 100644 --- a/pkg/kamailio/centos/6/kamailio.appl +++ b/pkg/kamailio/centos/6/kamailio.appl @@ -18,7 +18,7 @@ packages: - libevent # kamailio-json - libpurple # kamailio-purple - libunistring # kamailio-websocket - - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools # kamailio - mod_perl # kamailio-perl - mysql-libs # kamailio-mysql diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index 121ea51..58cf4a7 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -26,7 +26,7 @@ packages: - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - libunistring-devel # kamailio-websocket - - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools-devel # kamailio - lua-devel # kamailio-lua - make # kamailio diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index 4accdf8..8095ef1 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -22,7 +22,7 @@ packages: - libevent # kamailio-json - libpurple # kamailio-purple - libunistring # kamailio-websocket - - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools # kamailio - mod_perl # kamailio-perl - mono-core # kamailio-mono diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index f3ec261..4b4273f 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -287,6 +287,16 @@ BuildRequires: libxml2-devel C Diameter Peer module and extensions module for Kamailio. +%package ims +Summary: IMS modules and extensions module for Kamailio. +Group: System Environment/Daemons +Requires: libxml2, kamailio = %ver, kamailio-cdp = %ver +BuildRequires: libxml2-devel + +%description ims +IMS modules and extensions module for Kamailio. + + %if 0%{?fedora} %package radius Summary: Radius AAA API for Kamailio. @@ -483,6 +493,7 @@ fi %doc %{_docdir}/kamailio/modules/README.db_flatstore %doc %{_docdir}/kamailio/modules/README.db2_ops %doc %{_docdir}/kamailio/modules/README.debugger +#%doc %{_docdir}/kamailio/modules/README.dialog2 %doc %{_docdir}/kamailio/modules/README.enum %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -624,6 +635,7 @@ fi %{_libdir}/kamailio/modules/db_flatstore.so %{_libdir}/kamailio/modules/db2_ops.so %{_libdir}/kamailio/modules/debugger.so +%{_libdir}/kamailio/modules/dialog2.so %{_libdir}/kamailio/modules/enum.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/malloc_test.so @@ -959,6 +971,27 @@ fi %{_libdir}/kamailio/modules/cdp_avp.so +%files ims +%defattr(-,root,root) +%{_libdir}/kamailio/libkamailio_ims.so +%{_libdir}/kamailio/libkamailio_ims.so.0 +%{_libdir}/kamailio/libkamailio_ims.so.0.1 +#%doc %{_docdir}/kamailio/modules/README.auth_ims +%{_libdir}/kamailio/modules/auth_ims.so +#%doc %{_docdir}/kamailio/modules/README.icscf +%{_libdir}/kamailio/modules/icscf.so +#%doc %{_docdir}/kamailio/modules/README.isc +%{_libdir}/kamailio/modules/isc.so +#%doc %{_docdir}/kamailio/modules/README.registrar_pcscf +%{_libdir}/kamailio/modules/registrar_pcscf.so +#%doc %{_docdir}/kamailio/modules/README.registrar_scscf +%{_libdir}/kamailio/modules/registrar_scscf.so +#%doc %{_docdir}/kamailio/modules/README.usrloc_pcscf +%{_libdir}/kamailio/modules/usrloc_pcscf.so +#%doc %{_docdir}/kamailio/modules/README.usrloc_scscf +%{_libdir}/kamailio/modules/usrloc_scscf.so + + %files websocket %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.websocket @@ -1021,6 +1054,8 @@ fi %changelog +* Mon Dec 31 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Added dialog2 and IMS modules to the build * Fri Dec 21 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Added db2_ldap, db2_ops, and timer to the build - Added uid_auth_db, uid_avp_db, uid_domain, uid_gflags, uid_uri_db, print, diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index 4492805..1b2ccda 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -28,7 +28,7 @@ packages: - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - libunistring-devel # kamailio-websocket - - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools-devel # kamailio - lua-devel # kamailio-lua - make # kamailio diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index bafbf4a..f694ccb 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -23,7 +23,7 @@ packages: - libevent # kamailio-json - libpurple # kamailio-purple - libunistring # kamailio-websocket - - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-ims, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xhttp-pi, kamailio-xmlops, kamailio-xmlrpc - lksctp-tools # kamailio - mod_perl # kamailio-perl - mono-core # kamailio-mono

11 years, 10 months

git:master: parser/sdp: added partial parsing of a=candidate attributes

by Juha Heinanen

Module: sip-router Branch: master Commit: b7a1ea4c8a88eea873bf6b4bfac5e1f477a19073 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7a1ea4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Dec 31 15:51:53 2012 +0200 parser/sdp: added partial parsing of a=candidate attributes --- parser/sdp/sdp.c | 20 +++++++++++- parser/sdp/sdp.h | 14 ++++++++ parser/sdp/sdp_helpr_funcs.c | 74 ++++++++++++++++++++++++++++++++++++++++++ parser/sdp/sdp_helpr_funcs.h | 2 + 4 files changed, 109 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index df017be..ab04d60 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -161,6 +161,7 @@ static inline sdp_payload_attr_t *add_sdp_payload(sdp_stream_cell_t* _stream, in return payload_attr; } + /** * Initialize fast access pointers. */ @@ -550,6 +551,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a1p = fmtp_string.s + fmtp_string.len; payload_attr = (sdp_payload_attr_t*)get_sdp_payload4payload(stream, &rtp_payload); set_sdp_payload_fmtp(payload_attr, &fmtp_string); + } else if (parse_payload_attr && extract_candidate(&tmpstr1, stream) == 0) { + a1p += 2; } else if (extract_accept_types(&tmpstr1, &stream->accept_types) == 0) { a1p = stream->accept_types.s + stream->accept_types.len; } else if (extract_accept_wrapped_types(&tmpstr1, &stream->accept_wrapped_types) == 0) { @@ -777,6 +780,7 @@ void free_sdp(sdp_info_t** _sdp) sdp_session_cell_t *session, *l_session; sdp_stream_cell_t *stream, *l_stream; sdp_payload_attr_t *payload, *l_payload; + sdp_ice_attr_t *tmp; LM_DBG("_sdp = %p\n", _sdp); if (sdp == NULL) return; @@ -799,6 +803,11 @@ void free_sdp(sdp_info_t** _sdp) if (l_stream->p_payload_attr) { pkg_free(l_stream->p_payload_attr); } + while (l_stream->ice_attr) { + tmp = l_stream->ice_attr->next; + pkg_free(l_stream->ice_attr); + l_stream->ice_attr->next = tmp; + } pkg_free(l_stream); } pkg_free(l_session); @@ -811,8 +820,9 @@ void free_sdp(sdp_info_t** _sdp) void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) { sdp_payload_attr_t *payload; + sdp_ice_attr_t *ice_attr; - LOG(log_level , "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LOG(log_level , "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, @@ -822,6 +832,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) stream->payloads.len, stream->payloads.s, stream->bw_type.len, stream->bw_type.s, stream->bw_width.len, stream->bw_width.s, stream->payloads_num, stream->payload_attr, + stream->ice_attrs_num, stream->ice_attr, stream->sendrecv_mode.len, stream->sendrecv_mode.s, stream->ptime.len, stream->ptime.s, stream->path.len, stream->path.s, @@ -840,6 +851,13 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) payload->fmtp_string.len, payload->fmtp_string.s); payload=payload->next; } + ice_attr = stream->ice_attr; + while (ice_attr) { + LOG(log_level, "......'%.*s' %u\n", + ice_attr->foundation.len, ice_attr->foundation.s, + ice_attr->component_id); + ice_attr = ice_attr->next; + } } void print_sdp_session(sdp_session_cell_t *session, int log_level) diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 464c835..dc0dede 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -42,6 +42,17 @@ typedef struct sdp_payload_attr { str fmtp_string; } sdp_payload_attr_t; +typedef struct sdp_ice_attr { + struct sdp_ice_attr *next; + str foundation; + unsigned int component_id; + str transport; + str connection_addr; + str port; + str candidate_type; + int candidateType; /* ICE_HOST/ICE_SRFLX/ICE_PRFLX/ICE_RELAY/ICE_UNKNOWN */ +} sdp_ice_attr_t; + typedef struct sdp_stream_cell { struct sdp_stream_cell *next; /* c=<network type> <address type> <connection address> */ @@ -72,6 +83,9 @@ typedef struct sdp_stream_cell { str accept_wrapped_types; /**< RFC4975: accept-wrapped-types attribute */ struct sdp_payload_attr **p_payload_attr; /**< fast access pointers to payloads */ struct sdp_payload_attr *payload_attr; + int ice_attrs_num; /**< number of ICE attrs inside a stream */ + /* add fast access pointers to ice attributes if you need them */ + sdp_ice_attr_t *ice_attr; } sdp_stream_cell_t; typedef struct sdp_session_cell { diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 9fed80b..0b04530 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -27,10 +27,12 @@ */ +#include <stdlib.h> #include "../../ut.h" #include "../msg_parser.h" #include "../parser_f.h" #include "../parse_hname2.h" +#include "sdp.h" static struct { @@ -309,6 +311,78 @@ int extract_fmtp( str *body, str *fmtp_payload, str *fmtp_string ) return 0; } + +/** + * Allocate a new ice attribute + */ +static inline sdp_ice_attr_t *add_sdp_ice(sdp_stream_cell_t* _stream) +{ + sdp_ice_attr_t *ice_attr; + int len; + + len = sizeof(sdp_ice_attr_t); + ice_attr = (sdp_ice_attr_t *)pkg_malloc(len); + if (ice_attr == NULL) { + LM_ERR("No memory left\n"); + return NULL; + } + memset( ice_attr, 0, len); + + /* Insert the new ice attribute */ + ice_attr->next = _stream->ice_attr; + _stream->ice_attr = ice_attr; + _stream->ice_attrs_num++; + + return ice_attr; +} + + +int extract_candidate(str *body, sdp_stream_cell_t *stream) +{ + char *space, *start; + int len, fl; + sdp_ice_attr_t *ice_attr; + + if (strncasecmp(body->s, "a=candidate:", 12) != 0) { + /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ + return -1; + } + + start = body->s + 12; + len = body->len - 12; + + space = memchr(start, 32, len); + if ((space == NULL) || (space - start + 3 > len) || !isdigit(*(space + 1))) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } + + fl = space - start; + + start = space + 1; + len = len - (space - start + 1); + space = memchr(start, 32, len); + if (space == NULL) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } + + ice_attr = add_sdp_ice(stream); + if (ice_attr == NULL) { + LM_ERR("failed to add ice attribute\n"); + return -1; + } + + /* currently only foundation and component-id are parsed */ + /* if needed, parse more */ + ice_attr->foundation.s = body->s + 12; + ice_attr->foundation.len = fl; + ice_attr->component_id = strtol(start, (char **)NULL, 10); + + return 0; +} + + /* generic method for attribute extraction * field must has format "a=attrname:" */ int extract_field(str *body, str *value, str field) diff --git a/parser/sdp/sdp_helpr_funcs.h b/parser/sdp/sdp_helpr_funcs.h index 2456cee..cc46375 100644 --- a/parser/sdp/sdp_helpr_funcs.h +++ b/parser/sdp/sdp_helpr_funcs.h @@ -33,6 +33,7 @@ #include "../../str.h" #include "../msg_parser.h" +#include "sdp.h" /** * Detect the mixed part delimiter. @@ -50,6 +51,7 @@ int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold); int extract_mediaip(str *body, str *mediaip, int *pf, char *line); int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload, int *is_rtp); int extract_bwidth(str *body, str *bwtype, str *bwwitdth); +int extract_candidate(str *body, sdp_stream_cell_t *stream); /* RFC3605 attributes */ int extract_rtcp(str *body, str *rtcp);

11 years, 10 months

Status of outbound

by Peter Dunkley

Hi, I am currently working on the edge proxy features of outbound and I hope to have this complete by the freeze. I have noticed that there have been some commits by others relating to the registrar behaviour too. Does everyone believe that all of the bits needed for outbound support are now in hand, or are we missing anything? To my mind there are three parts: 1) Edge proxy 2) Registrar 3) Single server Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 10 months

Outbound: mid-dialog request routing

by Peter Dunkley

Hello, RFC 5626 section 5.3 briefly discusses mid-dialog request routing. I was wondering what we could do in this regard? In particular with respect to providing fail-over between flows within a dialog. Is this possible, if it is possible will anything more need to be added to Kamailio for this or can it be handled in the current configuration? Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 10 months

Outbound: Flow Timer

by Peter Dunkley

Hi, One optional feature of outbound is to add a flow timer value to 2xx responses from the registrar. To my mind this is something we should do when the REGISTER contains the outbound option-tag in a Supported: or Requires: header. I think the value should be set in conjunction with the value for tcp_connection_timeout on the edge proxy (in the case where TCP is used). Does anyone agree or disagree? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 10 months

git:master: modules/sipcapture README: added HEPv2/ v3 to supported protocols

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 680173cfc89bc051ce026ddf4a62dab494aa20a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=680173c… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Dec 31 00:33:16 2012 +0100 modules/sipcapture README: added HEPv2/v3 to supported protocols --- modules/sipcapture/README | 10 +++++----- modules/sipcapture/doc/sipcapture_admin.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/sipcapture/README b/modules/sipcapture/README index 28b7da9..872d477 100644 --- a/modules/sipcapture/README +++ b/modules/sipcapture/README @@ -10,9 +10,9 @@ Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> - Copyright � 2011 QSC AG + Copyright © 2011 QSC AG - Copyright � 2011 http://www.qsc.de + Copyright © 2011 http://www.qsc.de __________________________________________________________________ Table of Contents @@ -111,7 +111,7 @@ Chapter 1. Admin Guide Kamailio can capture SIP messages in three modes * IPIP encapsulation. (ETHHDR+IPHDR+IPHDR+UDPHDR). * Monitoring/mirroring port. - * Homer encapsulation protocol mode (HEP v1). + * Homer encapsulation protocol mode (HEP v1, v2, v3). The capturing can be turned on/off using fifo commad. @@ -351,7 +351,7 @@ modparam("sipcapture", "capture_node", "homer03") 4.1. sip_capture -4.1. sip_capture +4.1. sip_capture Name: sip_capture @@ -361,7 +361,7 @@ modparam("sipcapture", "capture_node", "homer03") + on + off The parameter is optional - if missing, the command will return the - status of the SIP message capturing (as string "on" or "off" ) + status of the SIP message capturing (as string “on” or “off” ) without changing anything. MI FIFO Command Format: diff --git a/modules/sipcapture/doc/sipcapture_admin.xml b/modules/sipcapture/doc/sipcapture_admin.xml index 8c0f3da..b81fa52 100644 --- a/modules/sipcapture/doc/sipcapture_admin.xml +++ b/modules/sipcapture/doc/sipcapture_admin.xml @@ -33,7 +33,7 @@ </listitem> <listitem> <para> - Homer encapsulation protocol mode (HEP v1). + Homer encapsulation protocol mode (HEP v1, v2, v3). </para> </listitem> </itemizedlist>

11 years, 10 months

git:master: modules:siptrace changed include to hep.h

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 13889dfc3274f86352c719276b52fd8a458c243f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13889df… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Dec 31 00:27:22 2012 +0100 modules:siptrace changed include to hep.h --- modules_k/siptrace/siptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 06111ab..0d36ba1 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -51,7 +51,7 @@ #include "../../str.h" #include "../../onsend.h" -#include "../../modules/sipcapture/sipcapture.h" +#include "../../modules/sipcapture/hep.h" #ifdef STATISTICS #include "../../lib/kcore/statistics.h"

11 years, 10 months

git:master: Added HEPv3 (UDP) support for sipcapture.

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 6eda5e28355df2f1085f0ab9d303309965c4cd4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6eda5e2… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Dec 31 00:21:02 2012 +0100 Added HEPv3 (UDP) support for sipcapture. Many many thanks Dragos Dinu for your help! Happy New Year! Glückliches neues Jahr! С Новым Годом! La Mulți Ani! --- modules/sipcapture/hep.c | 513 +++++++++++++++++++++++++++++++++++++++ modules/sipcapture/hep.h | 168 +++++++++++++ modules/sipcapture/sipcapture.c | 193 ++------------- modules/sipcapture/sipcapture.h | 27 -- 4 files changed, 699 insertions(+), 202 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6ed…

11 years, 10 months

← Newer
1
2
3
4
5
6
7
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012