sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:jason.penton/kamailio_ims_extensions: OpenIMS: cdp, cdp_avp - added latest modules
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 8ea97170d91de131a507d24bea888144d9a84db1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ea9717… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 07:51:02 2011 +0200 OpenIMS: cdp, cdp_avp - added latest modules - Latest CDP and CDP_AVP modules from openims --- modules/cdp/Makefile | 19 + modules/cdp/RFC3588.vsd | Bin 0 -> 300032 bytes modules/cdp/RFC3588_acct_state_machine_client.png | Bin 0 -> 440240 bytes modules/cdp/RFC3588_acct_state_machine_server.png | Bin 0 -> 272720 bytes modules/cdp/RFC3588_auth_state_machine_client.png | Bin 0 -> 418965 bytes modules/cdp/RFC3588_auth_state_machine_server.png | Bin 0 -> 230635 bytes modules/cdp/RFC3588_peer_state_machine_1.png | Bin 0 -> 305180 bytes modules/cdp/RFC3588_peer_state_machine_2.png | Bin 0 -> 369572 bytes modules/cdp/acceptor.c | 128 +++ modules/cdp/acceptor.h | 65 ++ modules/cdp/api_process.c | 122 ++ modules/cdp/api_process.h | 90 ++ modules/cdp/authstatemachine.c | 887 +++++++++++++++ modules/cdp/authstatemachine.h | 81 ++ modules/cdp/cdp_load.c | 123 ++ modules/cdp/cdp_load.h | 121 ++ modules/cdp/config.c | 241 ++++ modules/cdp/config.h | 157 +++ modules/cdp/configdtd.h | 114 ++ modules/cdp/configexample/ConfigExample.xml | 113 ++ modules/cdp/configparser.c | 491 ++++++++ modules/cdp/diameter.h | 303 +++++ modules/cdp/diameter_api.h | 228 ++++ modules/cdp/diameter_avp.c | 769 +++++++++++++ modules/cdp/diameter_code_avp.h | 579 ++++++++++ modules/cdp/diameter_code_result.h | 150 +++ modules/cdp/diameter_comm.c | 357 ++++++ modules/cdp/diameter_epc.h | 76 ++ modules/cdp/diameter_epc_code_app.h | 79 ++ modules/cdp/diameter_epc_code_avp.h | 941 ++++++++++++++++ modules/cdp/diameter_epc_code_cmd.h | 134 +++ modules/cdp/diameter_epc_code_result.h | 88 ++ modules/cdp/diameter_ims.h | 127 +++ modules/cdp/diameter_ims_code_app.h | 69 ++ modules/cdp/diameter_ims_code_avp.h | 506 +++++++++ modules/cdp/diameter_ims_code_cmd.h | 109 ++ modules/cdp/diameter_ims_code_result.h | 116 ++ modules/cdp/diameter_msg.c | 631 +++++++++++ modules/cdp/diameter_peer.c | 594 ++++++++++ modules/cdp/diameter_peer.h | 87 ++ modules/cdp/globals.c | 150 +++ modules/cdp/globals.h | 103 ++ modules/cdp/mod.c | 234 ++++ modules/cdp/mod.h | 213 ++++ modules/cdp/mod_wharf.c | 170 +++ modules/cdp/mod_wharf.h | 37 + modules/cdp/peer.c | 123 ++ modules/cdp/peer.h | 144 +++ modules/cdp/peermanager.c | 359 ++++++ modules/cdp/peermanager.h | 92 ++ modules/cdp/peerstatemachine.c | 1253 +++++++++++++++++++++ modules/cdp/peerstatemachine.h | 89 ++ modules/cdp/receiver.c | 1170 +++++++++++++++++++ modules/cdp/receiver.h | 107 ++ modules/cdp/routing.c | 195 ++++ modules/cdp/routing.h | 66 ++ modules/cdp/sem.h | 103 ++ modules/cdp/session.c | 685 +++++++++++ modules/cdp/session.h | 278 +++++ modules/cdp/tcp_accept.c | 251 ++++ modules/cdp/tcp_accept.h | 65 ++ modules/cdp/timer.c | 236 ++++ modules/cdp/timer.h | 93 ++ modules/cdp/transaction.c | 260 +++++ modules/cdp/transaction.h | 104 ++ modules/cdp/utils.h | 101 ++ modules/cdp/worker.c | 422 +++++++ modules/cdp/worker.h | 117 ++ modules/cdp_avp/Makefile | 22 + modules/cdp_avp/avp_add.c | 160 +++ modules/cdp_avp/avp_add.h | 99 ++ modules/cdp_avp/avp_get.c | 140 +++ modules/cdp_avp/avp_get.h | 100 ++ modules/cdp_avp/avp_get_base | 268 +++++ modules/cdp_avp/avp_get_base_data_format.c | 270 +++++ modules/cdp_avp/avp_get_base_data_format.h | 149 +++ modules/cdp_avp/avp_new.c | 86 ++ modules/cdp_avp/avp_new.h | 84 ++ modules/cdp_avp/avp_new_base_data_format.c | 243 ++++ modules/cdp_avp/avp_new_base_data_format.h | 200 ++++ modules/cdp_avp/base.c | 89 ++ modules/cdp_avp/base.h | 455 ++++++++ modules/cdp_avp/ccapp.c | 89 ++ modules/cdp_avp/ccapp.h | 489 ++++++++ modules/cdp_avp/epcapp.c | 126 ++ modules/cdp_avp/epcapp.h | 957 ++++++++++++++++ modules/cdp_avp/get_reference.h | 85 ++ modules/cdp_avp/get_reference.sh | 7 + modules/cdp_avp/imsapp.c | 90 ++ modules/cdp_avp/imsapp.h | 512 +++++++++ modules/cdp_avp/macros.h | 467 ++++++++ modules/cdp_avp/mod.c | 359 ++++++ modules/cdp_avp/mod_export.h | 228 ++++ modules/cdp_avp/nasapp.c | 89 ++ modules/cdp_avp/nasapp.h | 404 +++++++ 95 files changed, 22182 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8ea…

1 0

git:jason.penton/kamailio_ims_extensions: Revert "TM: moved fake reply wrapper to t_reply as opposed to t_cancel"
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 9a3494797ba61acd08e494fc170c62997bd9046b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a34947… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:49:07 2011 +0200 Revert "TM: moved fake reply wrapper to t_reply as opposed to t_cancel" - This is not required anymore This reverts commit 831ab80feec836dbfc7f4e497b590f7e76252b35. --- modules/tm/t_cancel.c | 8 ++++++++ modules/tm/t_cancel.h | 3 +++ modules/tm/t_reply.c | 6 ------ modules/tm/t_reply.h | 2 -- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 5b7d666..ac1bf4f 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,6 +65,8 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" +#include "timer.h" + /** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally @@ -541,3 +543,9 @@ error3: return ret; } + +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 7e446f1..8b44cc9 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,6 +96,9 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); +void w_fake_reply(struct cell *t, int branch, int code ); + + /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held * between this call and the call to cancel_uacs()/cancel_branch() diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 121e597..b7c3a84 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,9 +2629,3 @@ void rpc_reply(rpc_t* rpc, void* c) return; } } - -void w_fake_reply(struct cell *t, int branch, int code ) -{ - LOCK_REPLIES(t); - fake_reply(t, branch, code); -} diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index fd189b2..1fe81ad 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,6 +237,4 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t); typedef int (*tget_picked_f)(void); int t_get_picked_branch(void); -void w_fake_reply(struct cell *t, int branch, int code ); - #endif

1 0

git:jason.penton/kamailio_ims_extensions: Revert "TM: Expose fake reply via api"
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: a9c14fcd2fd89704d6c8250664b4bddcec9171f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9c14fc… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:49:51 2011 +0200 Revert "TM: Expose fake reply via api" - This is no longer required This reverts commit a8695bee7d918986fa32b05ae238cf1dcfa11aed. --- modules/tm/t_cancel.c | 6 ------ modules/tm/t_cancel.h | 2 -- modules/tm/timer.c | 2 +- modules/tm/timer.h | 2 +- modules/tm/tm_load.c | 1 - modules/tm/tm_load.h | 1 - modules/tm/uac.h | 2 -- 7 files changed, 2 insertions(+), 14 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ac1bf4f..c1b52be 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,7 +65,6 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" -#include "timer.h" /** Prepare to cancel a transaction. @@ -544,8 +543,3 @@ error3: } -void w_fake_reply(struct cell *t, int branch, int code ) -{ - LOCK_REPLIES(t); - fake_reply(t, branch, code); -} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 8b44cc9..874483c 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,8 +96,6 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); -void w_fake_reply(struct cell *t, int branch, int code ); - /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held diff --git a/modules/tm/timer.c b/modules/tm/timer.c index 768aa78..b834f11 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -335,7 +335,7 @@ inline static ticks_t delete_cell( struct cell *p_cell, int unlock ) /* generate a fake reply * it assumes the REPLY_LOCK is already held and returns unlocked */ -void fake_reply(struct cell *t, int branch, int code ) +static void fake_reply(struct cell *t, int branch, int code ) { struct cancel_info cancel_data; short do_cancel_branch; diff --git a/modules/tm/timer.h b/modules/tm/timer.h index 9acddc1..d506adb 100644 --- a/modules/tm/timer.h +++ b/modules/tm/timer.h @@ -148,7 +148,7 @@ extern struct msgid_var user_rt_t2_timeout_ms; extern struct msgid_var user_inv_max_lifetime; extern struct msgid_var user_noninv_max_lifetime; -void fake_reply(struct cell *t, int branch, int code ); + /** * \brief fix timer values to ticks */ diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index cda04f0..d57fd45 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -115,7 +115,6 @@ int load_tm( struct tm_binds *tmb) tmb->send_prepared_request = send_prepared_request; tmb->dlg_add_extra = dlg_add_extra; tmb->t_cancel_uac = t_uac_cancel; - tmb->fake_reply = w_fake_reply; #ifdef DIALOG_CALLBACKS tmb->register_new_dlg_cb=register_new_dlg_cb; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 58f0b70..370c2ef 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -91,7 +91,6 @@ struct tm_binds { cancel_all_uacs_f cancel_all_uacs; prepare_request_within_f prepare_request_within; send_prepared_request_f send_prepared_request; - fake_reply_f fake_reply; enum route_mode* route_mode; #ifdef DIALOG_CALLBACKS register_new_dlg_cb_f register_new_dlg_cb; diff --git a/modules/tm/uac.h b/modules/tm/uac.h index f10f0ab..619d43e 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -96,8 +96,6 @@ typedef int (*prepare_request_within_f)(uac_req_t *uac_r, typedef void (*send_prepared_request_f)(struct retr_buf *request_dst); typedef void (*generate_fromtag_f)(str*, str*); -typedef void (*fake_reply_f)(struct cell *cell, int branch, int code); - /* * Generate a fromtag based on given Call-ID */

1 0

git:jason.penton/kamailio_ims_extensions: Dialog2: The beginnings of a new dialog2 module
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 0123a51dcfe17c67f581c3202cca3f0b71a324e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0123a51… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:32:59 2011 +0200 Dialog2: The beginnings of a new dialog2 module - An effort to implement dialog2 based on wiki discussion: http://www.kamailio.org/dokuwiki/doku.php/modules-new-design:dialog-module-… Some of the original dialog functionality has been left out but will be restored soon, possibly with enhanced functionality. Right now, we have tested forked calls, early dialog dialog termination (config, mi and api). --- modules_k/dialog2/Makefile | 18 + modules_k/dialog2/dialog.c | 751 ++++++++++++++ modules_k/dialog2/dlg_cb.c | 262 +++++ modules_k/dialog2/dlg_cb.h | 141 +++ modules_k/dialog2/dlg_handlers.c | 1473 ++++++++++++++++++++++++++ modules_k/dialog2/dlg_handlers.h | 185 ++++ modules_k/dialog2/dlg_hash.c | 1718 +++++++++++++++++++++++++++++++ modules_k/dialog2/dlg_hash.h | 600 +++++++++++ modules_k/dialog2/dlg_load.h | 67 ++ modules_k/dialog2/dlg_profile.c | 850 +++++++++++++++ modules_k/dialog2/dlg_profile.h | 206 ++++ modules_k/dialog2/dlg_req_within.c | 517 ++++++++++ modules_k/dialog2/dlg_req_within.h | 58 + modules_k/dialog2/dlg_timer.c | 287 +++++ modules_k/dialog2/dlg_timer.h | 114 ++ modules_k/dialog2/dlg_var.c | 733 +++++++++++++ modules_k/dialog2/dlg_var.h | 88 ++ modules_k/dialog2/doc/Makefile | 4 + modules_k/dialog2/doc/dialog2.xml | 101 ++ modules_k/dialog2/doc/dialog2_admin.xml | 1211 ++++++++++++++++++++++ modules_k/dialog2/doc/dialog2_devel.xml | 268 +++++ modules_k/dialog2/doc/dialog2_faq.xml | 95 ++ 22 files changed, 9747 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=012…

1 0

git:jason.penton/kamailio_ims_extensions: TM: moved fake reply wrapper to t_reply as opposed to t_cancel
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 104f34d8d87831461b89ec0a01fd21fd6018952b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=104f34d… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 14:58:05 2011 +0200 TM: moved fake reply wrapper to t_reply as opposed to t_cancel - a little cleanup --- modules/tm/t_cancel.c | 8 -------- modules/tm/t_cancel.h | 3 --- modules/tm/t_reply.c | 6 ++++++ modules/tm/t_reply.h | 2 ++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ac1bf4f..5b7d666 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,8 +65,6 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" -#include "timer.h" - /** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally @@ -543,9 +541,3 @@ error3: return ret; } - -void w_fake_reply(struct cell *t, int branch, int code ) -{ - LOCK_REPLIES(t); - fake_reply(t, branch, code); -} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 8b44cc9..7e446f1 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,9 +96,6 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); -void w_fake_reply(struct cell *t, int branch, int code ); - - /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held * between this call and the call to cancel_uacs()/cancel_branch() diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index b7c3a84..121e597 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,3 +2629,9 @@ void rpc_reply(rpc_t* rpc, void* c) return; } } + +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 1fe81ad..fd189b2 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,4 +237,6 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t); typedef int (*tget_picked_f)(void); int t_get_picked_branch(void); +void w_fake_reply(struct cell *t, int branch, int code ); + #endif

1 0

git:jason.penton/kamailio_ims_extensions: rr: added possibility to add custom user to record route header
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 6afd475292c9c37b6a17dd5c1372de9c229c58cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6afd475… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 09:21:40 2011 +0200 rr: added possibility to add custom user to record route header - Added AVP to be set before calling record route to allow for custom user in record route headers. This is required in IMS instances, for example mo@... for mobile originating route --- modules_k/rr/doc/rr_admin.xml | 18 ++++++++++++++++++ modules_k/rr/record.c | 36 +++++++++++++++++++++++++++++++++++- modules_k/rr/record.h | 4 +++- modules_k/rr/rr_mod.c | 17 ++++++++++++++++- 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/modules_k/rr/doc/rr_admin.xml b/modules_k/rr/doc/rr_admin.xml index 8eb248e..d4906bf 100644 --- a/modules_k/rr/doc/rr_admin.xml +++ b/modules_k/rr/doc/rr_admin.xml @@ -212,6 +212,24 @@ modparam("rr", "add_username", 1) </programlisting> </example> </section> + + <section> + <title><varname>custom_user_avp</varname> (string)</title> + <para> + AVP to populate for custom user of record_route. If not set, + default URI user is used + </para> + <example> + <title>Set <varname>add_username</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rr", "custom_user_avp", "$avp(i:20") +$avp(i:20)="my_custom_user"; +record_route(); +... +</programlisting> + </example> + </section> <section> <title><varname>enable_socket_mismatch_warning</varname> (integer)</title> diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index 629c38a..525a7e7 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -74,6 +74,37 @@ static char rr_param_buf_ptr[RR_PARAM_BUF_SIZE]; static str rr_param_buf = {rr_param_buf_ptr,0}; static unsigned int rr_param_msg; +static pv_spec_t *custom_user_avp; /*!< AVP for custom_user setting */ + + +void init_custom_user(pv_spec_t *custom_user_avp_p) +{ + custom_user_avp = custom_user_avp_p; +} + +/*! + * \brief Return the custom_user for a record route + * \param req SIP message + * \param custom_user to be returned + * \return <0 for failure + */ +inline static int get_custom_user(struct sip_msg *req, str *custom_user) +{ + pv_value_t pv_val; + + if( custom_user_avp ) { + if ( pv_get_spec_value( req, custom_user_avp, &pv_val)==0 && + pv_val.flags&PV_VAL_STR && pv_val.rs.len>0 ) { + custom_user->s = pv_val.rs.s; + custom_user->len = pv_val.rs.len; + return 0; + } + LM_DBG("invalid AVP value, using default user from RURI\n"); + } + + return -1; + +} /*! @@ -281,14 +312,17 @@ int record_route(struct sip_msg* _m, str *params) str user; struct to_body* from = NULL; str* tag; - + user.len = 0; if (add_username) { + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { if (get_username(_m, &user) < 0) { LM_ERR("failed to extract username\n"); return -1; } + } } if (append_fromtag) { diff --git a/modules_k/rr/record.h b/modules_k/rr/record.h index f1ec944..0a96d24 100644 --- a/modules_k/rr/record.h +++ b/modules_k/rr/record.h @@ -31,7 +31,7 @@ #include "../../parser/msg_parser.h" #include "../../str.h" - +#include "../../pvar.h" /*! * \brief Insert a new Record-Route header field with lr parameter @@ -66,5 +66,7 @@ int record_route_preset(struct sip_msg* _m, str* _data); */ int add_rr_param(struct sip_msg* msg, str* rr_param); +void init_custom_user(pv_spec_t *custom_user_avp); + #endif /* RECORD_H */ diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 3e23eab..e2cc3f6 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -56,7 +56,9 @@ int append_fromtag = 1; /*!< append from tag by default */ int enable_double_rr = 1; /*!< enable using of 2 RR by default */ int enable_full_lr = 0; /*!< compatibilty mode disabled by default */ int add_username = 0; /*!< do not add username by default */ - int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ +int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ +static str custom_user_spec = {NULL, 0}; +pv_spec_t custom_user_avp; static unsigned int last_rr_msg; @@ -112,6 +114,7 @@ static param_export_t params[] ={ #endif {"add_username", INT_PARAM, &add_username}, {"enable_socket_mismatch_warning",INT_PARAM,&enable_socket_mismatch_warning}, + { "custom_user_avp", STR_PARAM, &custom_user_spec.s}, {0, 0, 0 } }; @@ -156,6 +159,18 @@ static int mod_init(void) i_user.len = 0; } #endif + + if (custom_user_spec.s) { + custom_user_spec.len = strlen(custom_user_spec.s); + if ( pv_parse_spec(&custom_user_spec, &custom_user_avp)==0 + && (custom_user_avp.type!=PVT_AVP)){ + LM_ERR("malformed or non AVP custom_user " + "AVP definition in '%.*s'\n", custom_user_spec.len,custom_user_spec.s); + return -1; + } + } + + init_custom_user(custom_user_spec.s?&custom_user_avp:0); return 0; }

1 0

git:jason.penton/kamailio_ims_extensions: TM: Expose fake reply via api
by Jason Penton 26 Oct '11

26 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 2b9eff8c3e4b90ae2dc7a43dd4b5ccbfa647d404 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b9eff8… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 14:09:50 2011 +0200 TM: Expose fake reply via api - Allows to be able to send fake replies through TM api. Useful for terminating early dialogs --- modules/tm/t_cancel.c | 6 ++++++ modules/tm/t_cancel.h | 2 ++ modules/tm/timer.c | 2 +- modules/tm/timer.h | 2 +- modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + modules/tm/uac.h | 2 ++ 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index c1b52be..ac1bf4f 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,6 +65,7 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" +#include "timer.h" /** Prepare to cancel a transaction. @@ -543,3 +544,8 @@ error3: } +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 874483c..8b44cc9 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,6 +96,8 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); +void w_fake_reply(struct cell *t, int branch, int code ); + /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held diff --git a/modules/tm/timer.c b/modules/tm/timer.c index b834f11..768aa78 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -335,7 +335,7 @@ inline static ticks_t delete_cell( struct cell *p_cell, int unlock ) /* generate a fake reply * it assumes the REPLY_LOCK is already held and returns unlocked */ -static void fake_reply(struct cell *t, int branch, int code ) +void fake_reply(struct cell *t, int branch, int code ) { struct cancel_info cancel_data; short do_cancel_branch; diff --git a/modules/tm/timer.h b/modules/tm/timer.h index d506adb..9acddc1 100644 --- a/modules/tm/timer.h +++ b/modules/tm/timer.h @@ -148,7 +148,7 @@ extern struct msgid_var user_rt_t2_timeout_ms; extern struct msgid_var user_inv_max_lifetime; extern struct msgid_var user_noninv_max_lifetime; - +void fake_reply(struct cell *t, int branch, int code ); /** * \brief fix timer values to ticks */ diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index d57fd45..cda04f0 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -115,6 +115,7 @@ int load_tm( struct tm_binds *tmb) tmb->send_prepared_request = send_prepared_request; tmb->dlg_add_extra = dlg_add_extra; tmb->t_cancel_uac = t_uac_cancel; + tmb->fake_reply = w_fake_reply; #ifdef DIALOG_CALLBACKS tmb->register_new_dlg_cb=register_new_dlg_cb; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 370c2ef..58f0b70 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -91,6 +91,7 @@ struct tm_binds { cancel_all_uacs_f cancel_all_uacs; prepare_request_within_f prepare_request_within; send_prepared_request_f send_prepared_request; + fake_reply_f fake_reply; enum route_mode* route_mode; #ifdef DIALOG_CALLBACKS register_new_dlg_cb_f register_new_dlg_cb; diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 619d43e..f10f0ab 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -96,6 +96,8 @@ typedef int (*prepare_request_within_f)(uac_req_t *uac_r, typedef void (*send_prepared_request_f)(struct retr_buf *request_dst); typedef void (*generate_fromtag_f)(str*, str*); +typedef void (*fake_reply_f)(struct cell *cell, int branch, int code); + /* * Generate a fromtag based on given Call-ID */

1 0

Why was IP type parsing removed from sdp in parser?
by Jason Penton 26 Oct '11

26 Oct '11

Hi All, Just curious as to why the parsing of IP type was removed from extract_mediaip in parser/sdp/sdp_helper_funcs.c. The latest code looks like below (could I suggest adding the highlighted part?): p.s. If there are no objections/responses I will commit to master branch. Cheers Jason int extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; int len; cp1 = NULL; for (cp = body->s; (len = body->s + body->len - cp) > 0;) { cp1 = (char*)ser_memmem(cp, line, len, 2); if (cp1 == NULL || cp1[-1] == '\n' || cp1[-1] == '\r') break; cp = cp1 + 2; } if (cp1 == NULL) return -1; mediaip->s = cp1 + 2; mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - mediaip->s; trim_len(mediaip->len, mediaip->s, *mediaip); if (mediaip->len == 0) { LM_ERR("no [%s] line in SDP\n",line); return -1; } /* search reverse for IP[4|6] in c=/o= line */ cp = (char*)ser_memrmem(mediaip->s, " IP", mediaip->len, 3); if (cp == NULL) { LM_ERR("no `IP[4|6]' in `%s' field\n",line); return -1; } switch (cp[3]) { case '4': *pf = AF_INET; break; case '6': *pf = AF_INET6; break; } /* safety checks: * - for lenght, at least 6: ' IP[4|6] x...' * - white space after */ if(cp + 6 > mediaip->s + mediaip->len && cp[4]!=' ') { LM_ERR("invalid content for `%s' line\n",line); return -1; } if(cp[3]!='4' && cp[3]!='6') { LM_ERR("invalid addrtype IPx for `%s' line\n",line); return -1; } cp += 5; /* next token is the IP address */ cp = eat_space_end(cp, mediaip->s + mediaip->len); len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; mediaip->s = cp; mediaip->len = len; if (mediaip->len == 0) { LM_ERR("no `IP[4|6]' address in `%s' field\n",line); return -1; } LM_DBG("located IP address [%.*s] in `%s' field\n", mediaip->len, mediaip->s, line); return 1; }

2 3

[tracker] Task opened: "Error while parsing Route HF" for some INVITEs (Attachment added)
by sip-router 25 Oct '11

25 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jorj Bauer (jorj) Attached to Project - sip-router Summary - "Error while parsing Route HF" for some INVITEs Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - (This happens in version 3.0.3 as well as 3.2.0, but flyspray hasn't been updated to show 3.2.0 yet - so I'm tagging it as "Development.") When a call is placed on hold on a shared line, S-R is failing to parse the headers on the way back. It ultimately reports: > find_first_route: Error while parsing Route HF and the call is dropped. This only happens when we're signaling using TCP (using UDP, this parse error does not occur, and the call is placed on hold properly). Attached is the output with debug=6, our (somewhat messy, still under development) configuration script, and a pcap of the entire exchange (starting with the REGISTER). The INVITE at 21:09:33.670245 (frame 46) is correctly challenged for AuthN. The UA responds (frame 54) with appropriate credentials. S-R responds with a "100 Trying" (frame 56), then internally has an "Error while parsing Route HF", which returns an error to the script's proxy_authenticate() call (line 1027 of siprouter.cfg), which (incorrectly) forces a re-send of "407 Proxy AuthN required" (frame 57) as the script can't differentiate between the internal failure and a failure to authenticate. The failing call (parse_rr.c, in do_parse_rr_body()) is passed a 0-length buffer; that comes from parse_rr(); that's called from the parse_rr() call in find_first_route() in modules_s/rr/loose.c. parse_headers() (just before the parse_rr() call in find_first_route()) doesn't appear to see the first few headers of the packet - including the Route header. I don't understand how the header pre-parsing and caching works here, so I don't know what's "normal"; but the packet in question does have a valid Route header: Route: <sip:128.91.197.35;transport=tcp;r2=on;avp=0VcDBwBhY2NvdW50AwB5ZXMDBgBzdGltZXIEADE4MDA;lr=on>, <sip:128.91.197.35;r2=on;avp=0VcDBwBhY2NvdW50AwB5ZXMDBgBzdGltZXIEADE4MDA;lr=on> The exact same header was parsed properly in the first INVITE, so I don't believe the parser itself is at fault. It seems more likely that this is related to some concurrent code path in two forks that's happening only with TCP flows but I can't find or prove that. That's as far as I can debug this with my limited knowledge of the internals of SIP Router. If I find more I'll post details to this ticket, but I don't expect to be able to debug this any deeper without input from someone that knows the internals of SIP Router better than I do. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=169 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.

1 0

[tracker] Assignee added: "Error while parsing Route HF" for some INVITEs
by sip-router 25 Oct '11

25 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#169 - "Error while parsing Route HF" for some INVITEs User who did this - Jorj Bauer (jorj) http://sip-router.org/tracker/index.php?do=details&task_id=169 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.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011