sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:pd/tcp_event_rt: core: first attempt at event_route for TCP connection close

by Peter Dunkley

Module: sip-router Branch: pd/tcp_event_rt Commit: db59a1b773750bc4b055f4498362bb004e76a67b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db59a1b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:27:17 2013 +0100 core: first attempt at event_route for TCP connection close --- tcp_main.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 8a650a1..7696f2a 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -152,7 +152,7 @@ #endif #include <sys/poll.h> - +#include "dset.h" #include "ip_addr.h" #include "pass_fd.h" #include "tcp_conn.h" @@ -3018,6 +3018,55 @@ inline static int tcpconn_chld_put(struct tcp_connection* tcpconn) +/* Fake message done the "old fashioned" way here so as not to add a dependency + on lib/kcore */ +#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" +#define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) +static char _faked_sip_msg[FAKED_SIP_MSG_LEN+1]; +static struct sip_msg _faked_msg; +static unsigned int _faked_msg_no = 0; + +inline static void tcp_close_run_route(struct tcp_connection *tcpconn) +{ + int rt, backup_rt; + struct run_act_ctx ctx; + + WARN("tcp_close_run_route event_route[tcp:closed]\n"); + + rt = route_get(&event_rt, "tcp:closed"); + if (rt < 0 || event_rt.rlist[rt] == NULL) + return; + + if (_faked_msg_no == 0) { + memcpy(_faked_sip_msg, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); + _faked_sip_msg[FAKED_SIP_MSG_LEN] = 0; + + memset(&_faked_msg, 0, sizeof(struct sip_msg)); + _faked_msg.buf = _faked_sip_msg; + _faked_msg.len = FAKED_SIP_MSG_LEN; + _faked_msg.set_global_address = default_global_address; + _faked_msg.set_global_port=default_global_port; + + if (parse_msg(_faked_msg.buf, _faked_msg.len, + &_faked_msg) != 0) { + LM_ERR("parse_msg failed\n"); + return; + } + } + + _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.pid = my_pid(); + memset(&_faked_msg.tval, 0, sizeof(struct timeval)); + _faked_msg.rcv = tcpconn->rcv; + clear_branches(); + + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], &_faked_msg, 0); + set_route_type(backup_rt); +} + /* simple destroy function (the connection should be already removed * from the hashes. refcnt 0 and the fds should not be watched anymore for IO) */ @@ -3026,6 +3075,9 @@ inline static void tcpconn_destroy(struct tcp_connection* tcpconn) DBG("tcpconn_destroy: destroying connection %p (%d, %d) " "flags %04x\n", tcpconn, tcpconn->id, tcpconn->s, tcpconn->flags); + + tcp_close_run_route(tcpconn); + if (unlikely(tcpconn->flags & F_CONN_HASHED)){ LOG(L_CRIT, "BUG: tcpconn_destroy: called with hashed" " connection (%p)\n", tcpconn);

11 years, 4 months

git:pd/tcp_event_rt: modules/{various}: updated because there is now an extra parameter on the append_branch() function

by Peter Dunkley

Module: sip-router Branch: pd/tcp_event_rt Commit: 1b0ad814aec79a44b865ad2d3552c4693fe2ea6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b0ad81… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:18:43 2013 +0100 modules/{various}: updated because there is now an extra parameter on the append_branch() function --- modules/alias_db/alookup.c | 2 +- modules/avpops/avpops_impl.c | 4 ++-- modules/corex/corex_lib.c | 2 +- modules/cpl-c/cpl_sig.c | 2 +- modules/dialplan/dialplan.c | 2 +- modules/domain/domain.c | 2 +- modules/enum/enum.c | 4 ++-- modules/exec/exec.c | 2 +- modules/ims_icscf/scscf_list.c | 2 +- modules/ims_isc/isc.c | 2 +- modules/permissions/permissions.c | 2 +- modules/xprint/xp_lib.c | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/alias_db/alookup.c b/modules/alias_db/alookup.c index aa25212..4437549 100644 --- a/modules/alias_db/alookup.c +++ b/modules/alias_db/alookup.c @@ -202,7 +202,7 @@ int alias_db_lookup(struct sip_msg* _msg, str table_s) } else { user_s.s = useruri_buf; if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0, - 0, 0, 0) == -1) + 0, 0, 0, 0) == -1) { LM_ERR("error while appending branches\n"); goto err_server; diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 890fc14..81a8053 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -999,7 +999,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, /* if is not the first modification, push the current uri as * branch */ if (append_branch( msg, 0, 0, 0, Q_UNSPECIFIED, - 0, 0, 0, 0, 0) != 1) + 0, 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error; @@ -1026,7 +1026,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, ruri_mark_new(); /* re-use uri for serial forking */ } else if (dst->opd&AVPOPS_USE_BRANCH) { if (append_branch( msg, &val, 0, 0, Q_UNSPECIFIED, 0, - msg->force_send_socket, 0, 0, 0) != 1) + msg->force_send_socket, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error; diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index bd81f3b..9d926c2 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -71,7 +71,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) getbflagsval(0, &branch_flags); ret = append_branch(msg, (uri.len>0)?&uri:0, &msg->dst_uri, &msg->path_vec, q, branch_flags, - msg->force_send_socket, 0, 0, 0); + msg->force_send_socket, 0, 0, 0, 0); if(uri.len<=0) diff --git a/modules/cpl-c/cpl_sig.c b/modules/cpl-c/cpl_sig.c index 34f61ac..630dc43 100644 --- a/modules/cpl-c/cpl_sig.c +++ b/modules/cpl-c/cpl_sig.c @@ -92,7 +92,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, (*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags); if(append_branch(msg, &(*locs)->addr.uri, &(*locs)->addr.received, 0, - Q_UNSPECIFIED, bflags, 0, 0, 0, 0)==-1){ + Q_UNSPECIFIED, bflags, 0, 0, 0, 0, 0)==-1){ LM_ERR("failed when appending branch <%s>\n", (*locs)->addr.uri.s); goto error; diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index d416d2f..8a3a136 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -295,7 +295,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, if(is_route_type(FAILURE_ROUTE) && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { - if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0) != 1) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); return -1; } diff --git a/modules/domain/domain.c b/modules/domain/domain.c index 60915bf..1134941 100644 --- a/modules/domain/domain.c +++ b/modules/domain/domain.c @@ -142,7 +142,7 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2) } return hash_table_lookup(&(_msg->parsed_uri.host), &did, &attrs); } else if (is_route_type(FAILURE_ROUTE)) { - branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0, 0); if (branch.s) { if (parse_uri(branch.s, branch.len, &puri) < 0) { LM_ERR("error while parsing branch URI\n"); diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 166be63..177669a 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -687,7 +687,7 @@ int do_query(struct sip_msg* _msg, char *user, char *name, str *service) { q = q - 10; curr_prio = priority; } - if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) == -1) { + if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) { goto done; } } @@ -1137,7 +1137,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, q = q - 10; curr_prio = priority; } - if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) + if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) { goto done; } diff --git a/modules/exec/exec.c b/modules/exec/exec.c index ab8d1e6..9e2e464 100644 --- a/modules/exec/exec.c +++ b/modules/exec/exec.c @@ -168,7 +168,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) { } } else { if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0, - 0, 0, 0) == -1) { + 0, 0, 0, 0) == -1) { LM_ERR("append_branch failed; too many or too long URIs?\n"); goto error02; } diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index 320bf64..c65a963 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -384,7 +384,7 @@ int I_scscf_select(struct sip_msg* msg, char* str1, char* str2) { } else { /* subsequent */ req = msg; - append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0); + append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); result = CSCF_RETURN_TRUE; } } else { diff --git a/modules/ims_isc/isc.c b/modules/ims_isc/isc.c index 7593703..ea9428e 100644 --- a/modules/ims_isc/isc.c +++ b/modules/ims_isc/isc.c @@ -76,7 +76,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { /* append branch if last trigger failed */ if (is_route_type(FAILURE_ROUTE)) - append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0); + append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); // Determines the tm transaction identifiers. // If no transaction, then creates one diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index f9115e8..d48f9e2 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -406,7 +406,7 @@ static int check_routing(struct sip_msg* msg, int idx) } check_branches: - for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0))!=0 ; + for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0,0))!=0 ; br_idx++ ) { uri_str = get_plain_uri(&branch); if (!uri_str) { diff --git a/modules/xprint/xp_lib.c b/modules/xprint/xp_lib.c index 7dd9c99..91cf76a 100644 --- a/modules/xprint/xp_lib.c +++ b/modules/xprint/xp_lib.c @@ -700,7 +700,7 @@ static int xl_get_branch(struct sip_msg *msg, str *res, str *hp, int hi, int hf) init_branch_iterator(); - branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0); + branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0, 0); if (!branch.s) { return xl_get_null(msg, res, hp, hi, hf); } @@ -731,7 +731,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h cnt = len = 0; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { cnt++; len += uri.len; @@ -756,7 +756,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h p = local_buf; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { if (i) {

11 years, 4 months

git:master: modules/{various}: updated because there is now an extra parameter on the append_branch() function

by Peter Dunkley

Module: sip-router Branch: master Commit: 1b0ad814aec79a44b865ad2d3552c4693fe2ea6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b0ad81… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:18:43 2013 +0100 modules/{various}: updated because there is now an extra parameter on the append_branch() function --- modules/alias_db/alookup.c | 2 +- modules/avpops/avpops_impl.c | 4 ++-- modules/corex/corex_lib.c | 2 +- modules/cpl-c/cpl_sig.c | 2 +- modules/dialplan/dialplan.c | 2 +- modules/domain/domain.c | 2 +- modules/enum/enum.c | 4 ++-- modules/exec/exec.c | 2 +- modules/ims_icscf/scscf_list.c | 2 +- modules/ims_isc/isc.c | 2 +- modules/permissions/permissions.c | 2 +- modules/xprint/xp_lib.c | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/alias_db/alookup.c b/modules/alias_db/alookup.c index aa25212..4437549 100644 --- a/modules/alias_db/alookup.c +++ b/modules/alias_db/alookup.c @@ -202,7 +202,7 @@ int alias_db_lookup(struct sip_msg* _msg, str table_s) } else { user_s.s = useruri_buf; if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0, - 0, 0, 0) == -1) + 0, 0, 0, 0) == -1) { LM_ERR("error while appending branches\n"); goto err_server; diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 890fc14..81a8053 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -999,7 +999,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, /* if is not the first modification, push the current uri as * branch */ if (append_branch( msg, 0, 0, 0, Q_UNSPECIFIED, - 0, 0, 0, 0, 0) != 1) + 0, 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error; @@ -1026,7 +1026,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, ruri_mark_new(); /* re-use uri for serial forking */ } else if (dst->opd&AVPOPS_USE_BRANCH) { if (append_branch( msg, &val, 0, 0, Q_UNSPECIFIED, 0, - msg->force_send_socket, 0, 0, 0) != 1) + msg->force_send_socket, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error; diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index bd81f3b..9d926c2 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -71,7 +71,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) getbflagsval(0, &branch_flags); ret = append_branch(msg, (uri.len>0)?&uri:0, &msg->dst_uri, &msg->path_vec, q, branch_flags, - msg->force_send_socket, 0, 0, 0); + msg->force_send_socket, 0, 0, 0, 0); if(uri.len<=0) diff --git a/modules/cpl-c/cpl_sig.c b/modules/cpl-c/cpl_sig.c index 34f61ac..630dc43 100644 --- a/modules/cpl-c/cpl_sig.c +++ b/modules/cpl-c/cpl_sig.c @@ -92,7 +92,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, (*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags); if(append_branch(msg, &(*locs)->addr.uri, &(*locs)->addr.received, 0, - Q_UNSPECIFIED, bflags, 0, 0, 0, 0)==-1){ + Q_UNSPECIFIED, bflags, 0, 0, 0, 0, 0)==-1){ LM_ERR("failed when appending branch <%s>\n", (*locs)->addr.uri.s); goto error; diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index d416d2f..8a3a136 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -295,7 +295,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, if(is_route_type(FAILURE_ROUTE) && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { - if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0) != 1) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); return -1; } diff --git a/modules/domain/domain.c b/modules/domain/domain.c index 60915bf..1134941 100644 --- a/modules/domain/domain.c +++ b/modules/domain/domain.c @@ -142,7 +142,7 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2) } return hash_table_lookup(&(_msg->parsed_uri.host), &did, &attrs); } else if (is_route_type(FAILURE_ROUTE)) { - branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0, 0); if (branch.s) { if (parse_uri(branch.s, branch.len, &puri) < 0) { LM_ERR("error while parsing branch URI\n"); diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 166be63..177669a 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -687,7 +687,7 @@ int do_query(struct sip_msg* _msg, char *user, char *name, str *service) { q = q - 10; curr_prio = priority; } - if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) == -1) { + if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) { goto done; } } @@ -1137,7 +1137,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, q = q - 10; curr_prio = priority; } - if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) + if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) { goto done; } diff --git a/modules/exec/exec.c b/modules/exec/exec.c index ab8d1e6..9e2e464 100644 --- a/modules/exec/exec.c +++ b/modules/exec/exec.c @@ -168,7 +168,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) { } } else { if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0, - 0, 0, 0) == -1) { + 0, 0, 0, 0) == -1) { LM_ERR("append_branch failed; too many or too long URIs?\n"); goto error02; } diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index 320bf64..c65a963 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -384,7 +384,7 @@ int I_scscf_select(struct sip_msg* msg, char* str1, char* str2) { } else { /* subsequent */ req = msg; - append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0); + append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); result = CSCF_RETURN_TRUE; } } else { diff --git a/modules/ims_isc/isc.c b/modules/ims_isc/isc.c index 7593703..ea9428e 100644 --- a/modules/ims_isc/isc.c +++ b/modules/ims_isc/isc.c @@ -76,7 +76,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { /* append branch if last trigger failed */ if (is_route_type(FAILURE_ROUTE)) - append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0); + append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); // Determines the tm transaction identifiers. // If no transaction, then creates one diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index f9115e8..d48f9e2 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -406,7 +406,7 @@ static int check_routing(struct sip_msg* msg, int idx) } check_branches: - for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0))!=0 ; + for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0,0))!=0 ; br_idx++ ) { uri_str = get_plain_uri(&branch); if (!uri_str) { diff --git a/modules/xprint/xp_lib.c b/modules/xprint/xp_lib.c index 7dd9c99..91cf76a 100644 --- a/modules/xprint/xp_lib.c +++ b/modules/xprint/xp_lib.c @@ -700,7 +700,7 @@ static int xl_get_branch(struct sip_msg *msg, str *res, str *hp, int hi, int hf) init_branch_iterator(); - branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0); + branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0, 0); if (!branch.s) { return xl_get_null(msg, res, hp, hi, hf); } @@ -731,7 +731,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h cnt = len = 0; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { cnt++; len += uri.len; @@ -756,7 +756,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h p = local_buf; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { if (i) {

11 years, 4 months

git:master: core: added fields to message structure and branch structure to hold user-agent string retrieved from usrloc

by Peter Dunkley

Module: sip-router Branch: master Commit: 8ca114df0fad44e4819cf80840f90e526ff655b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ca114d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:13:11 2013 +0100 core: added fields to message structure and branch structure to hold user-agent string retrieved from usrloc --- action.c | 2 +- config.h | 2 ++ dset.c | 36 ++++++++++++++++++++++++++++++------ dset.h | 13 ++++++++----- parser/msg_parser.c | 39 +++++++++++++++++++++++++++++++++++++++ parser/msg_parser.h | 5 +++++ select_core.c | 6 +++--- 7 files changed, 88 insertions(+), 15 deletions(-) diff --git a/action.c b/action.c index e2d9550..6fa85da 100644 --- a/action.c +++ b/action.c @@ -509,7 +509,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=append_branch(msg, &a->val[0].u.str, &msg->dst_uri, &msg->path_vec, a->val[1].u.number, (flag_t)flags, msg->force_send_socket, - 0, 0, 0); + 0, 0, 0, 0); /* if the uri is the ruri and q was also not changed, mark ruri as consumed, to avoid having an identical branch */ if ((a->val[0].u.str.s == 0 || a->val[0].u.str.len == 0) && diff --git a/config.h b/config.h index 1465f1e..32cd55c 100644 --- a/config.h +++ b/config.h @@ -77,6 +77,8 @@ #define MAX_RUID_SIZE 65 /*!< Maximum length of ruid for location records */ +#define MAX_UA_SIZE 255 /*!< Maximum length of user-agent for location records */ + #define MY_VIA "Via: SIP/2.0/UDP " #define MY_VIA_LEN (sizeof(MY_VIA) - 1) diff --git a/dset.c b/dset.c index 296f7c4..98be023 100644 --- a/dset.c +++ b/dset.c @@ -216,7 +216,7 @@ void set_branch_iterator(int n) char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int *flags, struct socket_info** force_socket, - str *ruid, str *instance) + str *ruid, str *instance, str *location_ua) { if (i < nr_branches) { *len = branches[i].len; @@ -241,6 +241,11 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, instance->len = branches[i].instance_len; instance->s = (instance->len)?branches[i].instance:0; } + if (location_ua) { + location_ua->len = branches[i].location_ua_len; + location_ua->s + = (location_ua->len)?branches[i].location_ua:0; + } return branches[i].uri; } else { *len = 0; @@ -265,6 +270,10 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, instance->s = 0; instance->len = 0; } + if (location_ua) { + location_ua->s = 0; + location_ua->len = 0; + } return 0; } } @@ -276,12 +285,12 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int* flags, struct socket_info** force_socket, - str* ruid, str *instance) + str* ruid, str *instance, str *location_ua) { char* ret; ret=get_branch(branch_iterator, len, q, dst_uri, path, flags, - force_socket, ruid, instance); + force_socket, ruid, instance, location_ua); if (likely(ret)) branch_iterator++; return ret; @@ -316,7 +325,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags, struct socket_info* force_socket, str* instance, unsigned int reg_id, - str* ruid) + str* ruid, str* location_ua) { str luri; @@ -416,6 +425,21 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, branches[nr_branches].ruid_len = 0; } + if (unlikely(location_ua && location_ua->len && location_ua->s)) { + if (unlikely(location_ua->len > MAX_UA_SIZE)) { + LOG(L_ERR, "too long location_ua: %.*s\n", + location_ua->len, location_ua->s); + return -1; + } + memcpy(branches[nr_branches].location_ua, location_ua->s, + location_ua->len); + branches[nr_branches].location_ua[location_ua->len] = 0; + branches[nr_branches].location_ua_len = location_ua->len; + } else { + branches[nr_branches].location_ua[0] = '\0'; + branches[nr_branches].location_ua_len = 0; + } + nr_branches++; return 1; } @@ -450,7 +474,7 @@ char* print_dset(struct sip_msg* msg, int* len) crt_branch = get_branch_iterator(); init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { cnt++; *len += uri.len; if (q != Q_UNSPECIFIED) { @@ -491,7 +515,7 @@ char* print_dset(struct sip_msg* msg, int* len) } init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { if (i) { memcpy(p, CONTACT_DELIM, CONTACT_DELIM_LEN); p += CONTACT_DELIM_LEN; diff --git a/dset.h b/dset.h index 3741fcb..dc15eba 100644 --- a/dset.h +++ b/dset.h @@ -70,6 +70,9 @@ struct branch char ruid[MAX_RUID_SIZE]; unsigned int ruid_len; + char location_ua[MAX_UA_SIZE + 1]; + unsigned int location_ua_len; + /* Branch flags */ flag_t flags; }; @@ -93,11 +96,11 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags, struct socket_info* force_socket, str* instance, unsigned int reg_id, - str* ruid); + str* ruid, str* location_ua); /*! \brief kamailio compatible version */ #define km_append_branch(msg, uri, dst_uri, path, q, flags, force_socket) \ - append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0, 0) + append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0, 0, 0) /*! \brief ser compatible append_branch version. * append_branch version compatible with ser: no path or branch flags support @@ -114,7 +117,7 @@ static inline int ser_append_branch(struct sip_msg* msg, s_uri.len=uri_len; s_dst_uri.s=dst_uri; s_dst_uri.len=dst_uri_len; - return append_branch(msg, &s_uri, &s_dst_uri, 0, q, 0, force_socket, 0, 0, 0); + return append_branch(msg, &s_uri, &s_dst_uri, 0, q, 0, force_socket, 0, 0, 0, 0); } @@ -140,12 +143,12 @@ void set_branch_iterator(int n); */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int* flags, struct socket_info** force_socket, - str *ruid, str *instance); + str *ruid, str *instance, str *location_ua); char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, str* path, unsigned int *flags, struct socket_info** force_socket, - str* ruid, str *instance); + str* ruid, str *instance, str *location_ua); /*! \brief * Empty the array of branches diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 9e5bd34..d8709e4 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -898,6 +898,45 @@ void reset_ruid(struct sip_msg* const msg) } +int set_ua(struct sip_msg* msg, str* location_ua) +{ + char* ptr; + + if (unlikely(!msg || !location_ua)) { + LM_ERR("invalid location_ua parameter value\n"); + return -1; + } + + if (unlikely(location_ua->len == 0)) { + reset_ua(msg); + } else if (msg->location_ua.s && (msg->location_ua.len >= location_ua->len)) { + memcpy(msg->location_ua.s, location_ua->s, location_ua->len); + msg->location_ua.len = location_ua->len; + } else { + ptr = (char*)pkg_malloc(location_ua->len); + if (!ptr) { + LM_ERR("not enough pkg memory for location_ua\n"); + return -1; + } + memcpy(ptr, location_ua->s, location_ua->len); + if (msg->location_ua.s) pkg_free(msg->location_ua.s); + msg->location_ua.s = ptr; + msg->location_ua.len = location_ua->len; + } + return 0; +} + + +void reset_ua(struct sip_msg* const msg) +{ + if(msg->location_ua.s != 0) { + pkg_free(msg->location_ua.s); + } + msg->location_ua.s = 0; + msg->location_ua.len = 0; +} + + hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { hdr_field_t *hdr; diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 37d1ecb..d58ea5e 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -366,6 +366,7 @@ typedef struct sip_msg { str instance; unsigned int reg_id; str ruid; + str location_ua; struct { int decoded; @@ -463,6 +464,10 @@ int set_ruid(struct sip_msg* msg, str* ruid); void reset_ruid(struct sip_msg* const msg); +int set_ua(struct sip_msg* msg, str *location_ua); + +void reset_ua(struct sip_msg* const msg); + /** force a specific send socket for forwarding a request. * @param msg - sip msg. * @param fsocket - forced socket, pointer to struct socket_info, can be 0 (in diff --git a/select_core.c b/select_core.c index 130a9fd..4d8fe06 100644 --- a/select_core.c +++ b/select_core.c @@ -1621,7 +1621,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { char *c; init_branch_iterator(); len = 0; - while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0))) { + while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0, 0))) { if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) { l = dst_uri.len; @@ -1645,7 +1645,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { init_branch_iterator(); res->len = 0; n = 0; - while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0))) { + while ((c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0, 0))) { if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) { l = dst_uri.len; c = dst_uri.s; @@ -1687,7 +1687,7 @@ int select_branch_uri(str* res, select_t* s, struct sip_msg* msg) { if (n < 0 || n >= nr_branches) return -1; init_branch_iterator(); - for (; (c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0)) && n; n--); + for (; (c = next_branch(&l, &q, &dst_uri, 0, 0, 0, 0, 0, 0)) && n; n--); if (!c) return 1; if (s->params[SEL_POS].v.i & SEL_BRANCH_DST_URI) {

11 years, 4 months

git:master: modules/registrar: store user-agent string retrieved from usrloc in msg and branch structures

by Peter Dunkley

Module: sip-router Branch: master Commit: 5aeef2c932581a67d535ade10995cc35ff85640a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5aeef2c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:15:21 2013 +0100 modules/registrar: store user-agent string retrieved from usrloc in msg and branch structures --- modules/registrar/lookup.c | 13 ++++++++++++- modules/registrar/reg_mod.h | 1 - modules/registrar/save.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index f3f74a2..be08056 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -280,6 +280,13 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) } } + if (ptr->user_agent.len) { + if (set_ua(_m, &(ptr->user_agent)) < 0) { + ret = -3; + goto done; + } + } + set_ruri_q(ptr->q); old_bflags = 0; @@ -324,7 +331,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) ptr->sock, ptr->instance.len?&(ptr->instance):0, ptr->instance.len?ptr->reg_id:0, - &ptr->ruid) + &ptr->ruid, &ptr->user_agent) == -1) { LM_ERR("failed to append a branch\n"); /* Also give a chance to the next branches*/ @@ -360,6 +367,7 @@ int reset_ruri_branch(sip_msg_t *msg) reset_instance(msg); msg->reg_id = 0; reset_ruid(msg); + reset_ua(msg); return 0; } @@ -385,6 +393,7 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) str ruri_b_instance = {0}; unsigned int ruri_b_reg_id = 0; str ruri_b_ruid = {0}; + str ruri_b_ua = {0}; branch_t *crt = NULL; ret = 1; @@ -410,6 +419,7 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) ruri_b_instance = msg->instance; ruri_b_reg_id = msg->reg_id; ruri_b_ruid = msg->ruid; + ruri_b_ua = msg->location_ua; reset_ruri_branch(msg); for(i=0; i<nr_branches_start; i++) { @@ -490,6 +500,7 @@ done: msg->instance = ruri_b_instance; msg->reg_id = ruri_b_reg_id; msg->ruid = ruri_b_ruid; + msg->location_ua = ruri_b_ua; return (found)?1:ret; } diff --git a/modules/registrar/reg_mod.h b/modules/registrar/reg_mod.h index 0ba6866..6992233 100644 --- a/modules/registrar/reg_mod.h +++ b/modules/registrar/reg_mod.h @@ -56,7 +56,6 @@ #define USERNAME_MAX_SIZE 64 #define DOMAIN_MAX_SIZE 128 #define CALLID_MAX_SIZE 255 -#define UA_MAX_SIZE 255 #define PATH_MODE_STRICT 2 #define PATH_MODE_LAZY 1 diff --git a/modules/registrar/save.c b/modules/registrar/save.c index bef5285..020358f 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -265,7 +265,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent && - _m->user_agent->body.len>0 && _m->user_agent->body.len<UA_MAX_SIZE) { + _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { ci.user_agent = &_m->user_agent->body; } else { ci.user_agent = &no_ua;

11 years, 4 months

git:master: modules/ims_registrar_scscf: use #define from core . h to specify the maximum UA length

by Peter Dunkley

Module: sip-router Branch: master Commit: 42063cacea9bf0f001f44b11216572b4f46e6e2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42063ca… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:17:48 2013 +0100 modules/ims_registrar_scscf: use #define from core .h to specify the maximum UA length --- modules/ims_registrar_scscf/reg_mod.h | 1 - modules/ims_registrar_scscf/save.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/ims_registrar_scscf/reg_mod.h b/modules/ims_registrar_scscf/reg_mod.h index d78e408..328d52f 100644 --- a/modules/ims_registrar_scscf/reg_mod.h +++ b/modules/ims_registrar_scscf/reg_mod.h @@ -62,7 +62,6 @@ #define USERNAME_MAX_SIZE 64 #define DOMAIN_MAX_SIZE 128 #define CALLID_MAX_SIZE 255 -#define UA_MAX_SIZE 255 #define PATH_MODE_STRICT 2 #define PATH_MODE_LAZY 1 diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 827f63e..4eb8ab5 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -259,7 +259,7 @@ static inline ucontact_info_t* pack_ci(struct sip_msg* _m, contact_t* _c, unsign /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent - && _m->user_agent->body.len > 0 && _m->user_agent->body.len < UA_MAX_SIZE) { + && _m->user_agent->body.len > 0 && _m->user_agent->body.len < MAX_UA_SIZE) { ci.user_agent = &_m->user_agent->body; } else { ci.user_agent = &no_ua;

11 years, 4 months

git:master: modules/pv: added PVs to provide access to the user-agent string retrieved from usrloc

by Peter Dunkley

Module: sip-router Branch: master Commit: 7bb5f98d7fd77ca6c21fb11e16d69116ef12cbb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bb5f98… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat May 18 00:14:07 2013 +0100 modules/pv: added PVs to provide access to the user-agent string retrieved from usrloc --- modules/pv/pv.c | 3 +++ modules/pv/pv_branch.c | 12 +++++++++++- modules/pv/pv_core.c | 24 +++++++++++++++++++++--- modules/pv/pv_core.h | 3 +++ 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 2c4d544..44d35e0 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -416,6 +416,9 @@ static pv_export_t mod_pvs[] = { {{"ruid", (sizeof("ruid")-1)}, /* */ PVT_OTHER, pv_get_ruid, 0, 0, 0, 0, 0}, + {{"location_ua", (sizeof("location_ua")-1)}, /* */ + PVT_OTHER, pv_get_location_ua, 0, + 0, 0, 0, 0}, { {"shv", (sizeof("shv")-1)}, PVT_OTHER, pv_get_shvar, pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 791bb5a..0b5138a 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -41,6 +41,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, unsigned int fl = 0; struct socket_info* fsocket = NULL; str ruid; + str location_ua; /* get the index */ if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) @@ -49,7 +50,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } - uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid, 0); + uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid, 0, &location_ua); /* branch(count) doesn't need a valid branch, everything else does */ if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) @@ -84,6 +85,10 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, if(ruid.len==0) return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &ruid); + case 8: /* location_ua */ + if(location_ua.len==0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &location_ua); default: /* 0 - uri */ return pv_get_strval(msg, param, res, &uri); @@ -253,6 +258,9 @@ int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, case 7: /* ruid */ /* do nothing - cannot set the ruid */ break; + case 8: /* location_ua */ + /* do nothing - cannot set the location_ua */ + break; default: /* 0 - uri */ if(val==NULL || (val->flags&PV_VAL_NULL)) @@ -316,6 +324,8 @@ int pv_parse_branchx_name(pv_spec_p sp, str *in) case 11: if(strncmp(in->s, "send_socket", 11)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "location_ua", 11)==0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; case 5: diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 3dda6a2..4225f21 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1359,7 +1359,7 @@ int pv_get_branch(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); - branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0, 0); if (!branch.s) { return pv_get_null(msg, param, res); } @@ -1388,7 +1388,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, cnt = s.len = 0; - while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { cnt++; s.len += uri.len; @@ -1412,7 +1412,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, i = 0; p = pv_local_buf; - while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0, 0))) + while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { if (i) { @@ -1823,6 +1823,24 @@ int pv_get_ruid(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->ruid); } +int pv_get_location_ua(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) + return pv_get_null(msg, param, res); + + if(msg->location_ua.len==0) + { + LM_DBG("no location_ua\n"); + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &msg->location_ua); +} + int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index 9b62d41..193185b 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -217,6 +217,9 @@ int pv_get_cnt(struct sip_msg *msg, pv_param_t *param, int pv_get_ruid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_location_ua(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

11 years, 4 months

git:master: modules/sdpops: Added new function sdp_get_line_startswith( avpvar, string).

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 381a052a8864198a62057dc307fdf39bbffe5436 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=381a052… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Fri May 17 21:35:59 2013 +0300 modules/sdpops: Added new function sdp_get_line_startswith(avpvar, string). --- modules/sdpops/README | 21 ++++++- modules/sdpops/doc/sdpops_admin.xml | 22 ++++++ modules/sdpops/sdpops_mod.c | 122 +++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 1 deletions(-) diff --git a/modules/sdpops/README b/modules/sdpops/README index 88f8c86..f070500 100644 --- a/modules/sdpops/README +++ b/modules/sdpops/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2011 asipto.com + Copyright © 2011 asipto.com __________________________________________________________________ Table of Contents @@ -38,6 +38,7 @@ Daniel-Constantin Mierla 4.10. sdp_print(level) 4.11. sdp_get(avpvar) 4.12. sdp_content() + 4.13. sdp_get_line_startswith(avpvar, string) List of Examples @@ -53,6 +54,7 @@ Daniel-Constantin Mierla 1.10. sdp_print usage 1.11. sdp_get usage 1.12. sdp_content usage + 1.13. sdp_get_line_startswith usage Chapter 1. Admin Guide @@ -79,6 +81,7 @@ Chapter 1. Admin Guide 4.10. sdp_print(level) 4.11. sdp_get(avpvar) 4.12. sdp_content() + 4.13. sdp_get_line_startswith(avpvar, string) 1. Overview @@ -124,6 +127,7 @@ Chapter 1. Admin Guide 4.10. sdp_print(level) 4.11. sdp_get(avpvar) 4.12. sdp_content() + 4.13. sdp_get_line_startswith(avpvar, string) 4.1. sdp_remove_codecs_by_id(list) @@ -319,3 +323,18 @@ if(sdp_content()) { ... } ... + +4.13. sdp_get_line_startswith(avpvar, string) + + Store the search part of SDP body message with line beginning with + 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error + and -2 if there is no SDP part in the message body. + + This function can be used from ANY_ROUTE. + + Example 1.13. sdp_get_line_startswith usage +... +if(sdp_get_line_startswith("$avp(mline)", "m=")) { + xlog("m-line: $avp(mline)\n"); +} +... diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index 831669e..2dd3e11 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -366,6 +366,28 @@ if(sdp_content()) { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">sdp_get_line_startswith(avpvar, string)</function> + </title> + <para> + Store the search part of SDP body message with line beginning with 'string' in an AVP. + Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sdp_get_line_startswith</function> usage</title> + <programlisting format="linespecific"> +... +if(sdp_get_line_startswith("$avp(mline)", "m=")) { + xlog("m-line: $avp(mline)\n"); +} +... +</programlisting> + </example> + </section> </section> </chapter> diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 2d2e668..8ba3022 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -30,6 +30,7 @@ #include "../../dprint.h" #include "../../mod_fix.h" #include "../../pvar.h" +#include "../../usr_avp.h" #include "../../parser/sdp/sdp.h" #include "../../parser/sdp/sdp_helpr_funcs.h" #include "../../trim.h" @@ -52,6 +53,8 @@ static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); static int w_sdp_get(sip_msg_t* msg, char *bar); static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar); +static int w_sdp_get_line_startswith(sip_msg_t* msg, char *foo, char *bar); + static int mod_init(void); @@ -84,6 +87,8 @@ static cmd_export_t cmds[] = { 1, 0, 0, ANY_ROUTE}, {"sdp_content", (cmd_function)w_sdp_content, 0, 0, 0, ANY_ROUTE}, + {"sdp_get_line_startswith", (cmd_function)w_sdp_get_line_startswith, + 2, 0, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -1122,6 +1127,123 @@ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) /** * */ +static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *s_line) +{ + sdp_info_t *sdp = NULL; + str body = {NULL, 0}; + str line = {NULL, 0}; + char* p = NULL; + str s; + str sline; + int_str avp_val; + int_str avp_name; + pv_spec_t *avp_spec = NULL; + static unsigned short avp_type = 0; + int sdp_missing=1; + + if (s_line == NULL || strlen(s_line) <= 0) + { + LM_ERR("Search string is null or empty\n"); + return -1; + } + sline.s = s_line; + sline.len = strlen(s_line); + + sdp_missing = parse_sdp(msg); + + if(sdp_missing < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + sdp = (sdp_info_t *)msg->body; + + if (sdp_missing || sdp == NULL) + { + LM_DBG("No SDP\n"); + return -2; + } + + body.s = sdp->raw_sdp.s; + body.len = sdp->raw_sdp.len; + + if (body.s==NULL) { + LM_ERR("failed to get the message body\n"); + return -1; + } + + body.len = msg->len - (body.s - msg->buf); + if (body.len==0) { + LM_DBG("message body has zero length\n"); + return -1; + } + + if (avp == NULL || strlen(avp) <= 0) + { + LM_ERR("avp variable is null or empty\n"); + return -1; + } + + s.s = avp; + s.len = strlen(s.s); + + if (pv_locate_name(&s) != s.len) + { + LM_ERR("invalid parameter\n"); + return -1; + } + + if (((avp_spec = pv_cache_get(&s)) == NULL) + || avp_spec->type!=PVT_AVP) { + LM_ERR("malformed or non AVP %s AVP definition\n", avp); + return -1; + } + + if(pv_get_avp_name(0, &avp_spec->pvp, &avp_name, &avp_type)!=0) + { + LM_ERR("[%s]- invalid AVP definition\n", avp); + return -1; + } + + p = find_sdp_line(body.s, body.s+body.len, sline.s[0]); + while (p != NULL) + { + if (sdp_locate_line(msg, p, &line) != 0) + { + LM_ERR("sdp_locate_line fail\n"); + return -1; + } + + if (strncmp(line.s, sline.s, sline.len) == 0) + { + avp_val.s.s = line.s; + avp_val.s.len = line.len; + + // remove ending \r\n if exists + if (avp_val.s.s[line.len-2] == '\r' && avp_val.s.s[line.len-1] == '\n') + { + avp_val.s.s[line.len-2] = '\0'; + avp_val.s.len -= 2; + } + + if (add_avp(AVP_VAL_STR | avp_type, avp_name, avp_val) != 0) + { + LM_ERR("Failed to add SDP line avp"); + return -1; + } + + return 1; + } + + p = find_sdp_line(line.s + line.len, body.s + body.len, sline.s[0]); + } + + return 0; +} + +/** + * + */ int bind_sdpops(struct sdpops_binds *sob){ if (sob == NULL) { LM_WARN("bind_sdpops: Cannot load sdpops API into a NULL pointer\n");

11 years, 4 months

[tracker] Task closed: modules/debugger: Added dbg.mod_level RPC command

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#297 - modules/debugger: Added dbg.mod_level RPC command User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=297 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 4 months

git:master: modules/debugger: refresh README

by Victor Seva

Module: sip-router Branch: master Commit: 012816e404b52de697514e4f897ec8a8abe42abc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=012816e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri May 17 17:49:14 2013 +0200 modules/debugger: refresh README --- modules/debugger/README | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index ff1b32b..84d9c97 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright (c) 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -45,6 +45,7 @@ Daniel-Constantin Mierla 5.1. dbg.ls 5.2. dbg.trace 5.3. dbg.bp + 5.4. dbg.mod_level 6. Usage @@ -94,6 +95,7 @@ Chapter 1. Admin Guide 5.1. dbg.ls 5.2. dbg.trace 5.3. dbg.bp + 5.4. dbg.mod_level 6. Usage @@ -295,6 +297,7 @@ if($si=="10.0.0.10") 5.1. dbg.ls 5.2. dbg.trace 5.3. dbg.bp + 5.4. dbg.mod_level 5.1. dbg.ls @@ -365,6 +368,20 @@ if($si=="10.0.0.10") dbg.bp eval 1234 $fu dbg.bp move 1234 +5.4. dbg.mod_level + + Specify module log level. + + Name: dbg.mod_level + + Parameters: + * _module_ : For core log level, use module name 'core' + * _level_ : integer + + Examples of use with kamcmd: + dbg.mod_level core 3 + dbg.mod_level tm 3 + 6. Usage A common usage is to investigate the execution path for a specific SIP

11 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013