sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
200 discussions

git:master: rtpproxy: when adding ICE relay candidates, always include RTCP candidate

by Ovidiu Sas

Module: sip-router Branch: master Commit: 2e58de7e16203c849cf1c445dfb33d304ffd3507 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e58de7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 21:13:29 2013 -0500 rtpproxy: when adding ICE relay candidates, always include RTCP candidate --- modules/rtpproxy/rtpproxy.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 6963187..016a9a1 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1429,18 +1429,15 @@ append_filtered_ip(char *at, str *ip) static int insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, - str *rtcp_port, int priority) + int priority) { char *buf, *at; struct lump* anchor; str rtp_port; + str rtcp_port; - if (rtcp_port->len) { - buf = pkg_malloc(24 + 78 + 14 + 24 + 2*ip->len + 2 + 2*rtcp_port->len + - 24); - } else { - buf = pkg_malloc(12 + 39 + 12 + 12 + ip->len + 1 + rtcp_port->len + 12); - } + rtcp_port.s = int2str(port+1, &rtcp_port.len); /* beware static buffer */ + buf = pkg_malloc(24 + 78 + 14 + 24 + 2*ip->len + 2 + 2*rtcp_port.len + 24); if (buf == NULL) { LM_ERR("insert_candidates: out of memory\n"); return -1; @@ -1448,7 +1445,6 @@ insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, at = buf; - if (rtcp_port->len) { append_str(at, "a=candidate:", 12); at = append_filtered_ip(at, ip); append_str(at, " 2 UDP ", 7); @@ -1459,11 +1455,10 @@ insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, } append_str(at, ip->s, ip->len); append_chr(at, ' '); - append_str(at, rtcp_port->s, rtcp_port->len); + append_str(at, rtcp_port.s, rtcp_port.len); append_str(at, " typ relay\r\n", 12); - } - rtp_port.s = int2str(port, &rtp_port.len); + rtp_port.s = int2str(port, &rtp_port.len); /* beware static buffer */ append_str(at, "a=candidate:", 12); at = append_filtered_ip(at, ip); append_str(at, " 1 UDP ", 7); @@ -1477,6 +1472,8 @@ insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, append_str(at, rtp_port.s, rtp_port.len); append_str(at, " typ relay\r\n", 12); + LM_DBG("inserting '%.*s'\n", (int)(at - buf), buf); + anchor = anchor_lump(msg, where - msg->buf, 0, 0); if (anchor == 0) { LOG(L_ERR, "insert_candidates: can't get anchor\n"); @@ -2704,13 +2701,12 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc /* Add ice relay candidates */ if (ice_candidate_priority_val.n && sdp_stream->ice_attrs_num > 0) { - body1.s = sdp_stream->ice_attr->foundation.s - 12; - body1.len = bodylimit - body1.s; - if (insert_candidates(msg, sdp_stream->ice_attr->foundation.s - 12, - &newip, port, &newrtcp, - ice_candidate_priority_val.n) == -1) { - FORCE_RTP_PROXY_RET (-1); - } + body1.s = sdp_stream->ice_attr->foundation.s - 12; + body1.len = bodylimit - body1.s; + if (insert_candidates(msg, sdp_stream->ice_attr->foundation.s - 12, + &newip, port, ice_candidate_priority_val.n) == -1) { + FORCE_RTP_PROXY_RET (-1); + } } c1p = sdp_session->ip_addr.s;

11 years, 8 months

git:master: sdp: fix TABS and whitespaces

by Ovidiu Sas

Module: sip-router Branch: master Commit: 05d02fd85b12f8e529f088e28cd1923351631e31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05d02fd… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 20:12:56 2013 -0500 sdp: fix TABS and whitespaces --- parser/sdp/sdp.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 6521b2f..6b24030 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -59,7 +59,7 @@ typedef struct sdp_stream_cell { int pf; /**< connection address family: AF_INET/AF_INET6 */ str ip_addr; /**< connection address */ int stream_num; /**< stream index inside a session */ - int is_rtp; /**< flag indicating if this is an RTP stream */ + int is_rtp; /**< flag indicating if this is an RTP stream */ int is_on_hold; /**< flag indicating if this stream is on hold */ /* m=<media> <port> <transport> <payloads> */ str media; @@ -81,12 +81,12 @@ typedef struct sdp_stream_cell { str max_size; /**< RFC4975: max-size attribute */ str accept_types; /**< RFC4975: accept-types attribute */ str accept_wrapped_types; /**< RFC4975: accept-wrapped-types attribute */ - str raw_stream; /**< fast access to raw stream string */ - struct sdp_payload_attr **p_payload_attr; /**< fast access pointers to payloads */ + str raw_stream; /**< fast access to raw stream string */ + 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; + 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; @@ -95,16 +95,16 @@ typedef struct sdp_session_cell { int session_num; /**< session index inside sdp */ str cnt_disp; /**< the Content-Disposition header (for Content-Type:multipart/mixed) */ /* c=<network type> <address type> <connection address> */ - int pf; /**< connection address family: AF_INET/AF_INET6 */ - str ip_addr; /**< connection address */ + int pf; /**< connection address family: AF_INET/AF_INET6 */ + str ip_addr; /**< connection address */ /* o=<username> <session id> <version> <network type> <address type> <address> */ - int o_pf; /**< origin address family: AF_INET/AF_INET6 */ - str o_ip_addr; /**< origin address */ + int o_pf; /**< origin address family: AF_INET/AF_INET6 */ + str o_ip_addr; /**< origin address */ /* b=<bwtype>:<bandwidth> */ str bw_type; /**< alphanumeric modifier giving the meaning of the <bandwidth> figure: CT - conference total; AS - application specific */ - str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ + str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ int streams_num; /**< number of streams inside a session */ struct sdp_stream_cell* streams; } sdp_session_cell_t; @@ -115,10 +115,10 @@ typedef struct sdp_session_cell { typedef struct sdp_info { msg_body_type_t type; free_msg_body_f free; - str text; /**< link to start of sdp and its length */ - int sessions_num; /**< number of SDP sessions */ + str text; /**< link to start of sdp and its length */ + int sessions_num; /**< number of SDP sessions */ int streams_num; /**< total number of streams for all SDP sessions */ - str raw_sdp; /* Pointer to the Raw SDP (Might be embedded in multipart body) */ + str raw_sdp; /* Pointer to the Raw SDP (Might be embedded in multipart body) */ struct sdp_session_cell *sessions; } sdp_info_t;

11 years, 8 months

[PATCH] Clean up code formatting

by Paul Belanger

>From my understand, patches are submitted to the mailing list. -- Paul Belanger | PolyBeacon, Inc. Jabber: paul.belanger(a)polybeacon.com | IRC: pabelanger (Freenode) Github: https://github.com/pabelanger | Twitter: https://twitter.com/pabelanger

11 years, 8 months

git:master: xhttp_rpc: cosmetic updates to header's web page

by Ovidiu Sas

Module: sip-router Branch: master Commit: b6e2a5c152de3f13251bca6a4f52f8bc9f725018 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6e2a5c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 12:08:20 2013 -0500 xhttp_rpc: cosmetic updates to header's web page --- modules/xhttp_rpc/xhttp_rpc_fnc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c index 5c9ffbd..b25405e 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -142,7 +142,7 @@ static const str XHTTP_RPC_Response_Title_Table_1 = str_init(\ "<tr bgcolor=\"#BBDDFF\">"\ "<td colspan=2 valign=\"top\" align=\"left\" bgcolor=\"#EFF7FF\" width=\"100%%\">"\ "<br/><h2 align=\"center\">"); -static const str XHTTP_RPC_Response_Title_Table_2 = str_init(" RPC Interface</h2>"\ +static const str XHTTP_RPC_Response_Title_Table_2 = str_init(": RPC Interface</h2>"\ "<p align=\"center\">"); static const str XHTTP_RPC_Response_Title_Table_4 = str_init("</p><br/></td></tr></table>\n<center>\n"); @@ -199,7 +199,7 @@ static const str XHTTP_RPC_Response_Foot = str_init(\ "<span style='margin-left:5px;'></span>"\ "<a href=\"http://sip-router.org\">SIP Router web site</a> .:. "\ "<a href=\"http://www.kamailio.org\">Kamailio web site</a><br/>"\ - "Copyright © 2011 <a href=\"http://www.voipembedded.com/\">VoIP Embedded</a>"\ + "Copyright © 2011-2013 <a href=\"http://www.voipembedded.com/\">VoIP Embedded</a>"\ ". All rights reserved."\ "</div></body></html>");

11 years, 8 months

git:master: xhttp_pi: fix default value for xhttp_pi_root param

by Ovidiu Sas

Module: sip-router Branch: master Commit: c3db1a1b598416d1380d54e1a21e9991070a075b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3db1a1… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 11:27:15 2013 -0500 xhttp_pi: fix default value for xhttp_pi_root param --- modules/xhttp_pi/xhttp_pi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi.c b/modules/xhttp_pi/xhttp_pi.c index 8768daa..f9b8cc1 100644 --- a/modules/xhttp_pi/xhttp_pi.c +++ b/modules/xhttp_pi/xhttp_pi.c @@ -76,7 +76,7 @@ static xhttp_api_t xhttp_api; gen_lock_t* ph_lock; -str xhttp_pi_root = str_init("http_pi"); +str xhttp_pi_root = str_init("pi"); str filename = {NULL, 0}; int buf_size = 0;

11 years, 8 months

git:admorten/sca: sca: fix race condition when two endpoints seize same index simultaneously

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: cebfc1599c665f0b678c0e6a86903dac6babb03f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cebfc15… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 14 16:55:36 2013 -0500 sca: fix race condition when two endpoints seize same index simultaneously - return 480 Temporarily Unavailable to loser of race. --- modules/sca/sca_appearance.c | 45 +++++++++++++++++++++++++++++++++----- modules/sca/sca_appearance.h | 10 ++++++-- modules/sca/sca_call_info.c | 2 +- modules/sca/sca_reply.c | 14 +++++++++++- modules/sca/sca_subscribe.c | 49 ++++++++++++++++++++++++++--------------- 5 files changed, 91 insertions(+), 29 deletions(-) diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index 81e304c..f613630 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -347,11 +347,12 @@ done: sca_appearance * sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, - int app_idx, int slot_idx ) + int app_idx, int slot_idx, int *seize_error ) { sca_appearance_list *app_list; sca_appearance *app = NULL; sca_hash_slot *slot; + int error = SCA_APPEARANCE_ERR_UNKNOWN; slot = sca_hash_table_slot_for_index( scam->appearances, slot_idx ); @@ -368,9 +369,8 @@ sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, } } if ( app != NULL && app->index == app_idx ) { - LM_ERR( "sca_appearance_seize_index_unsafe: tried to seize in-use " - "%.*s appearance-index %d for %.*s", STR_FMT( aor ), - app_idx, STR_FMT( owner_uri )); + /* attempt to seize in-use appearance-index */ + error = SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE; app = NULL; goto done; } @@ -379,16 +379,49 @@ sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, if ( app == NULL ) { LM_ERR( "Failed to create new appearance for %.*s at index %d", STR_FMT( owner_uri ), app_idx ); + error = SCA_APPEARANCE_ERR_MALLOC; goto done; } app->state = SCA_APPEARANCE_STATE_SEIZED; sca_appearance_list_insert_appearance( app_list, app ); + error = SCA_APPEARANCE_OK; + done: + if ( seize_error ) { + *seize_error = error; + } + return( app ); } + int +sca_appearance_seize_index( sca_mod *scam, str *aor, int idx, str *owner_uri ) +{ + sca_appearance *app; + int slot_idx; + int app_idx = -1; + int error = SCA_APPEARANCE_OK; + + slot_idx = sca_hash_table_index_for_key( scam->appearances, aor ); + sca_hash_table_lock_index( scam->appearances, slot_idx ); + + app = sca_appearance_seize_index_unsafe( scam, aor, owner_uri, + idx, slot_idx, &error ); + if ( app != NULL ) { + app_idx = app->index; + } + + sca_hash_table_unlock_index( scam->appearances, slot_idx ); + + if ( error == SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE ) { + app_idx = SCA_APPEARANCE_INDEX_UNAVAILABLE; + } + + return( app_idx ); +} + sca_appearance * sca_appearance_seize_next_available_unsafe( sca_mod *scam, str *aor, str *owner_uri, int slot_idx ) @@ -856,7 +889,7 @@ sca_appearance_update_index( sca_mod *scam, str *aor, int idx, if ( app == NULL ) { LM_WARN( "Cannot update %.*s index %d to %.*s: index %d not in use", STR_FMT( aor ), idx, STR_FMT( &state_str ), idx ); - rc = SCA_APPEARANCE_ERR_INVALID_INDEX; + rc = SCA_APPEARANCE_ERR_INDEX_INVALID; goto done; } @@ -974,7 +1007,7 @@ sca_appearance_release_index( sca_mod *scam, str *aor, int idx ) if ( app == NULL ) { LM_ERR( "Failed to unlink %.*s appearance-index %d: invalid index", STR_FMT( aor ), idx ); - rc = SCA_APPEARANCE_ERR_INVALID_INDEX; + rc = SCA_APPEARANCE_ERR_INDEX_INVALID; goto done; } sca_appearance_free( app ); diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index e1d623b..0d0abd8 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -48,10 +48,13 @@ enum { enum { SCA_APPEARANCE_OK = 0, SCA_APPEARANCE_ERR_NOT_IN_USE = 0x1001, - SCA_APPEARANCE_ERR_INVALID_INDEX = 0x1002, - SCA_APPEARANCE_ERR_MALLOC = 0x1004, + SCA_APPEARANCE_ERR_INDEX_INVALID = 0x1002, + SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE = 0x1004, + SCA_APPEARANCE_ERR_MALLOC = 0x1008, SCA_APPEARANCE_ERR_UNKNOWN = 0x1f00, }; +#define SCA_APPEARANCE_INDEX_UNAVAILABLE -2 + extern const str SCA_APPEARANCE_INDEX_STR; extern const str SCA_APPEARANCE_STATE_STR; @@ -98,7 +101,8 @@ void sca_appearance_state_to_str( int, str * ); int sca_appearance_state_from_str( str * ); sca_appearance *sca_appearance_seize_index_unsafe( sca_mod *, str *, str *, - int, int ); + int, int, int * ); +int sca_appearance_seize_index( sca_mod *, str *, int, str * ); int sca_appearance_seize_next_available_index( sca_mod *, str *, str * ); sca_appearance *sca_appearance_seize_next_available_unsafe( sca_mod *, str *, str *, int ); diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index d717eb1..ec0e2b6 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -777,7 +777,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info, rc = 1; } else { app = sca_appearance_seize_index_unsafe( sca, aor, contact_uri, - call_info->index, slot_idx ); + call_info->index, slot_idx, NULL ); if ( app == NULL ) { LM_ERR( "sca_call_info_uri_update: failed to seize index %d " "for %.*s", call_info->index, STR_FMT( contact_uri )); diff --git a/modules/sca/sca_reply.c b/modules/sca/sca_reply.c index dfe66e4..8da3a6e 100644 --- a/modules/sca/sca_reply.c +++ b/modules/sca/sca_reply.c @@ -76,7 +76,19 @@ sca_reply( sca_mod *scam, int status_code, char *status_msg, LM_ERR( "Failed to add Allow-Events and Expires headers" ); return( -1 ); } - } + } else if ( status_code == 480 ) { + /* tell loser of line-seize SUBSCRIBE race to try again shortly */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Retry-After: %d%s", 1, CRLF ); + extra_headers.len = len; + + if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, + LUMP_RPL_HDR ) == NULL ) { + LM_ERR( "sca_reply: failed to add Retry-After header" ); + return( -1 ); + } + } if ( scam->sl_api->freply( msg, status_code, &status_str ) < 0 ) { LM_ERR( "Failed to send \"%d %s\" reply to %.*s", diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 2f7a7f0..e6d6ed6 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1096,7 +1096,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) sca_subscription req_sub; sca_subscription *sub = NULL; sca_call_info call_info; - hdr_field_t *call_info_hdr; + hdr_field_t *call_info_hdr = NULL; str sub_key = STR_NULL; str *to_tag = NULL; char *status_text; @@ -1151,6 +1151,23 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) /* pkg_malloc'd in sca_subscription_copy_subscription_key above */ pkg_free( sub_key.s ); + if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { + call_info_hdr = sca_call_info_header_find( msg->headers ); + if ( call_info_hdr ) { + if ( sca_call_info_body_parse( &call_info_hdr->body, + &call_info ) < 0 ) { + SCA_REPLY_ERROR( sca, 400, "Bad Request - " + "Invalid Call-Info header", msg ); + goto done; + } + app_idx = call_info.index; + } else { + SCA_REPLY_ERROR( sca, 400, "Bad Request - " + "missing Call-Info header", msg ); + goto done; + } + } + sca_hash_table_lock_index( sca->subscriptions, idx ); sub = sca_hash_table_index_kv_find_unsafe( sca->subscriptions, idx, @@ -1165,17 +1182,6 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { - call_info_hdr = sca_call_info_header_find( msg->headers ); - if ( call_info_hdr ) { - if ( sca_call_info_body_parse( &call_info_hdr->body, - &call_info ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " - "Invalid Call-Info header", msg ); - goto done; - } - app_idx = call_info.index; - } - if ( req_sub.expires == 0 ) { /* release the seized appearance */ if ( call_info_hdr == NULL ) { @@ -1192,13 +1198,17 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } } else if ( SCA_STR_EMPTY( to_tag )) { /* don't seize new index if this is a line-seize reSUBSCRIBE */ - app_idx = sca_appearance_seize_next_available_index( sca, - &req_sub.target_aor, &req_sub.subscriber ); - if ( app_idx < 0 ) { + app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, + app_idx, &req_sub.subscriber ); + if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { + SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + goto done; + } else if ( app_idx < 0 ) { SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done; } + req_sub.index = app_idx; } } } else { @@ -1211,9 +1221,12 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( req_sub.expires > 0 ) { if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { - app_idx = sca_appearance_seize_next_available_index( sca, - &req_sub.target_aor, &req_sub.subscriber ); - if ( app_idx < 0 ) { + app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, + app_idx, &req_sub.subscriber ); + if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { + SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + goto done; + } else if ( app_idx < 0 ) { SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done;

11 years, 8 months

Wiki hacked

by Peter Dunkley

Hello, It looks like someone has deleted and re-written the front page of the wiki at http://www.kamailio.org/wiki/start Regards, Peter

11 years, 8 months

git:pd/msrp: modules/msrp: Now links msrp to kcore ( needed for fake SIP message used in new event_route)

by Peter Dunkley

Module: sip-router Branch: pd/msrp Commit: ecff5ed28ee98278b0831495a9883d454c7163ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecff5ed… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 13 11:02:55 2013 +0000 modules/msrp: Now links msrp to kcore (needed for fake SIP message used in new event_route) --- modules/msrp/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/msrp/Makefile b/modules/msrp/Makefile index 436f47f..ed04c4a 100644 --- a/modules/msrp/Makefile +++ b/modules/msrp/Makefile @@ -10,6 +10,7 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules

11 years, 8 months

git:pd/msrp: modules/msrp: Made use of cmap mandatory as tmap and failure reports require it

by Peter Dunkley

Module: sip-router Branch: pd/msrp Commit: 4a2ed1cc36e1f69695b0441f7b6c4df36be6235c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a2ed1c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 13 11:03:51 2013 +0000 modules/msrp: Made use of cmap mandatory as tmap and failure reports require it --- modules/msrp/msrp_mod.c | 51 +++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/modules/msrp/msrp_mod.c b/modules/msrp/msrp_mod.c index c1a0b04..5162652 100644 --- a/modules/msrp/msrp_mod.c +++ b/modules/msrp/msrp_mod.c @@ -69,12 +69,12 @@ static int w_msrp_tmap_del(sip_msg_t* msg, char* str1, char* str2); static void msrp_local_timer(unsigned int ticks, void* param); /*!< Local timer handler */ int msrp_param_sipmsg = 1; -int msrp_cmap_size = 0; +int msrp_cmap_size = 8; int msrp_auth_min_expires = 60; int msrp_auth_max_expires = 3600; int msrp_timer_interval = 60; str msrp_use_path_addr = { 0 }; -int msrp_tmap_size = 10; +int msrp_tmap_size = 8; static int msrp_frame_received(void *data); sip_msg_t *msrp_fake_sipmsg(msrp_frame_t *mf); @@ -169,30 +169,30 @@ static int mod_init(void) return -1; } - if(msrp_cmap_size>0) { - if(msrp_cmap_size>16) - msrp_cmap_size = 16; - if(msrp_cmap_init(1<<msrp_cmap_size)<0) { - LM_ERR("Cannot init internal cmap\n"); - return -1; - } + if(msrp_tmap_init_rpc()<0) + { + LM_ERR("failed to register tmap RPC commands\n"); + return -1; } - if(msrp_tmap_size>0) { - if(msrp_tmap_size>16) - msrp_tmap_size = 16; - if(msrp_tmap_init(1<<msrp_tmap_size)<0) { - LM_ERR("Cannot init tmap\n"); - return -1; - } + if(msrp_cmap_size<=0) msrp_cmap_size = 8; + else if(msrp_cmap_size>16) msrp_cmap_size = 16; + if(msrp_cmap_init(1<<msrp_cmap_size)<0) { + LM_ERR("Cannot init internal cmap\n"); + return -1; } - if (msrp_cmap_size> 0 || msrp_tmap_size> 0) { - if(msrp_timer_interval<=0) - msrp_timer_interval = 60; - register_sync_timers(1); + if(msrp_tmap_size<=0) msrp_tmap_size = 8; + else if(msrp_tmap_size>16) msrp_tmap_size = 16; + if(msrp_tmap_init(1<<msrp_tmap_size)<0) { + LM_ERR("Cannot init tmap\n"); + return -1; } + if(msrp_timer_interval<=0) + msrp_timer_interval = 60; + register_sync_timers(1); + sr_event_register_cb(SREV_TCP_MSRP_FRAME, msrp_frame_received); return 0; } @@ -209,12 +209,11 @@ static int child_init(int rank) if (rank!=PROC_MAIN) return 0; - if(msrp_cmap_size>0 || msrp_tmap_size>0) { - if(fork_sync_timer(PROC_TIMER, "MSRP Timer", 1 /*socks flag*/, - msrp_local_timer, NULL, msrp_timer_interval /*sec*/)<0) { - LM_ERR("failed to start timer routine as process\n"); - return -1; /* error */ - } + + if(fork_sync_timer(PROC_TIMER, "MSRP Timer", 1 /*socks flag*/, + msrp_local_timer, NULL, msrp_timer_interval /*sec*/)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ } return 0;

11 years, 8 months

git:pd/msrp: modules/msrp: Made some PVs available in new msrp: transaction-timeout event_route

by Peter Dunkley

Module: sip-router Branch: pd/msrp Commit: 774373d3b5eeb067cdaa645f6a0d65238fa62247 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=774373d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 13 11:00:47 2013 +0000 modules/msrp: Made some PVs available in new msrp:transaction-timeout event_route - Also added missing break to switch/case --- modules/msrp/msrp_vars.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index fdc277a..43d2fa2 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -65,6 +65,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -162,11 +163,15 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) s.len = mf->hbody.len; return pv_get_strval(msg, param, res, &s); case 5: - hdr = msrp_get_hdr_by_id(mf, MSRP_HDR_MESSAGE_ID); - if(hdr==NULL) - return pv_get_null(msg, param, res); - s.s = hdr->body.s; - s.len = hdr->body.len; + if (unlikely(mf->req_cache)) { + s = mf->req_cache->message_id; + } else { + hdr = msrp_get_hdr_by_id(mf, MSRP_HDR_MESSAGE_ID); + if(hdr==NULL) + return pv_get_null(msg, param, res); + s.s = hdr->body.s; + s.len = hdr->body.len; + } trim(&s); return pv_get_strval(msg, param, res, &s); case 6: @@ -177,13 +182,17 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 7: return pv_get_uintval(msg, param, res, mf->buf.len); case 8: - if(msrp_parse_hdr_to_path(mf)<0) - return pv_get_null(msg, param, res); - hdr = msrp_get_hdr_by_id(mf, MSRP_HDR_TO_PATH); - if(hdr==NULL) - return pv_get_null(msg, param, res); - sar = (str_array_t*)hdr->parsed.data; - s = sar->list[0]; + if (unlikely(mf->req_cache)) { + s = mf->req_cache->local_uri; + } else { + if(msrp_parse_hdr_to_path(mf)<0) + return pv_get_null(msg, param, res); + hdr = msrp_get_hdr_by_id(mf, MSRP_HDR_TO_PATH); + if(hdr==NULL) + return pv_get_null(msg, param, res); + sar = (str_array_t*)hdr->parsed.data; + s = sar->list[0]; + } trim(&s); if(msrp_parse_uri(s.s, s.len, &uri)<0 || uri.session.len<=0) return pv_get_null(msg, param, res); @@ -197,7 +206,11 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 10: return pv_get_uintval(msg, param, res, mf->mbody.len); case 11: - s = mf->fline.transaction; + if (unlikely(mf->req_cache)) { + s = mf->req_cache->transaction_id; + } else { + s = mf->fline.transaction; + } trim(&s); return pv_get_strval(msg, param, res, &s); case 12:

11 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013