sr-dev

sr-dev@lists.kamailio.org

12 participants
44183 discussions

git:master: registrar(k): missing extern for ul

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 611b511e251a85cf837300df77e323f3a1eff155 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=611b511… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:31:57 2009 +0200 registrar(k): missing extern for ul --- modules_k/registrar/reg_mod.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 33209ee..2d50de6 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -98,7 +98,7 @@ extern int path_use_params; extern str sock_hdr_name; extern int sock_flag; -usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions */ +extern usrloc_api_t ul;/*!< Structure containing pointers to usrloc functions*/ extern struct sl_binds slb;

15 years, 8 months

git:master: pua_usrloc(k): missing extern for pua_send_publish & pua_send_subscribe

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 67b6c6fffaf16d5843be23b3372ecb8aa7a7037e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67b6c6f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:31:15 2009 +0200 pua_usrloc(k): missing extern for pua_send_publish & pua_send_subscribe --- modules_k/pua_usrloc/pua_usrloc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pua_usrloc/pua_usrloc.h b/modules_k/pua_usrloc/pua_usrloc.h index 7be83c0..594c5e1 100644 --- a/modules_k/pua_usrloc/pua_usrloc.h +++ b/modules_k/pua_usrloc/pua_usrloc.h @@ -26,8 +26,8 @@ #define _PUA_UL #include "../pua/pua_bind.h" -send_publish_t pua_send_publish; -send_subscribe_t pua_send_subscribe; +extern send_publish_t pua_send_publish; +extern send_subscribe_t pua_send_subscribe; void ul_publish(ucontact_t* c, int type, void* param); int pua_unset_publish(struct sip_msg* msg , void* param);

15 years, 8 months

git:master: rr(s): missing extern for avp_flag_dialog

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: abf23e8a75880e0f6f024abfb606e7809c0d54fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abf23e8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:34:57 2009 +0200 rr(s): missing extern for avp_flag_dialog --- modules_s/rr/avp_cookie.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/rr/avp_cookie.h b/modules_s/rr/avp_cookie.h index 1781389..86b4118 100644 --- a/modules_s/rr/avp_cookie.h +++ b/modules_s/rr/avp_cookie.h @@ -46,7 +46,7 @@ typedef struct avp_save_item_t { extern regex_t* cookie_filter_re; extern unsigned short crc_secret; -avp_flags_t avp_flag_dialog; +extern avp_flags_t avp_flag_dialog; int rr_add_avp_cookie(struct sip_msg *msg, char *param1, char *param2); str *rr_get_avp_cookies(void);

15 years, 8 months

git:master: mangler(s): missing extern

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bc0a1dab6aacd35e74bef1f6818b240e09289307 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc0a1da… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:34:20 2009 +0200 mangler(s): missing extern --- modules_s/mangler/sdp_mangler.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/mangler/sdp_mangler.h b/modules_s/mangler/sdp_mangler.h index 093b9fc..a9488d7 100644 --- a/modules_s/mangler/sdp_mangler.h +++ b/modules_s/mangler/sdp_mangler.h @@ -70,8 +70,8 @@ from the last group -regex_t *portExpression; -regex_t *ipExpression; +extern regex_t *portExpression; +extern regex_t *ipExpression;

15 years, 8 months

git:master: sms(s): sms_report_type & tmb declared in multiple places

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cb247f058a2c5617edcecb57d111431716dfb4c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb247f0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:35:39 2009 +0200 sms(s): sms_report_type & tmb declared in multiple places --- modules_s/sms/libsms_putsms.c | 1 - modules_s/sms/sms.c | 1 - modules_s/sms/sms_funcs.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules_s/sms/libsms_putsms.c b/modules_s/sms/libsms_putsms.c index 468da0d..efd619d 100644 --- a/modules_s/sms/libsms_putsms.c +++ b/modules_s/sms/libsms_putsms.c @@ -25,7 +25,6 @@ mailto:s.frings@mail.isis.de #include "libsms_modem.h" -int sms_report_type; static char hexa[16] = { '0','1','2','3','4','5','6','7', diff --git a/modules_s/sms/sms.c b/modules_s/sms/sms.c index e7beb64..db4ea66 100644 --- a/modules_s/sms/sms.c +++ b/modules_s/sms/sms.c @@ -84,7 +84,6 @@ str domain; int *queued_msgs = 0; int use_contact = 0; int sms_report_type = NO_REPORT; -struct tm_binds tmb; static cmd_export_t cmds[]={ diff --git a/modules_s/sms/sms_funcs.c b/modules_s/sms/sms_funcs.c index 1f4f18e..51696f7 100644 --- a/modules_s/sms/sms_funcs.c +++ b/modules_s/sms/sms_funcs.c @@ -68,7 +68,6 @@ int nr_of_modems; int max_sms_parts; int *queued_msgs; int use_contact; -int sms_report_type; struct tm_binds tmb;

15 years, 8 months

git:master: sms(k): sms_report_type & tmb declared in multiple places

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a3088112a2f689d240be1506a5d6a3499e8703b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a308811… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:33:19 2009 +0200 sms(k): sms_report_type & tmb declared in multiple places --- modules_k/sms/libsms_putsms.c | 1 - modules_k/sms/sms.c | 1 - modules_k/sms/sms_funcs.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules_k/sms/libsms_putsms.c b/modules_k/sms/libsms_putsms.c index 89b2d41..8223f0d 100644 --- a/modules_k/sms/libsms_putsms.c +++ b/modules_k/sms/libsms_putsms.c @@ -25,7 +25,6 @@ mailto:s.frings@mail.isis.de #include "libsms_modem.h" -int sms_report_type; static char hexa[16] = { '0','1','2','3','4','5','6','7', diff --git a/modules_k/sms/sms.c b/modules_k/sms/sms.c index 4d96c80..e482267 100644 --- a/modules_k/sms/sms.c +++ b/modules_k/sms/sms.c @@ -76,7 +76,6 @@ str domain; int *queued_msgs = 0; int use_contact = 0; int sms_report_type = NO_REPORT; -struct tm_binds tmb; static proc_export_t sms_procs[] = { diff --git a/modules_k/sms/sms_funcs.c b/modules_k/sms/sms_funcs.c index 4b48a46..b4fd322 100644 --- a/modules_k/sms/sms_funcs.c +++ b/modules_k/sms/sms_funcs.c @@ -61,7 +61,6 @@ int nr_of_modems; int max_sms_parts; int *queued_msgs; int use_contact; -int sms_report_type; struct tm_binds tmb;

15 years, 8 months

git:master: tm: missing extern for rpc_cancel_doc[]

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ea982a3a4dad156143c35e9d1c6f32d3f5f8de9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea982a3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:25:56 2009 +0200 tm: missing extern for rpc_cancel_doc[] --- modules/tm/t_cancel.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 759f4f0..2ae96f2 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -113,7 +113,7 @@ inline short static should_cancel_branch( struct cell *t, int b, int noreply ) return 0; } -const char* rpc_cancel_doc[2]; +extern const char* rpc_cancel_doc[2]; void rpc_cancel(rpc_t* rpc, void* c); int cancel_b_flags_fixup(void* handle, str* gname, str* name, void** val); int cancel_b_flags_get(unsigned int* f, int m);

15 years, 8 months

git:master: tm: _tm_table should be extern

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: efbb8d1d0fc0f9a560d085a133699a9b23bd075f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efbb8d1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:24:08 2009 +0200 tm: _tm_table should be extern - _tm_table was declared in h_table.h without "extern", causing a _tm_table symbol to be created in each module including h_table.h. Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules/tm/h_table.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index d38e3d6..dd18820 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -424,7 +424,8 @@ struct s_table /* pointer to the big table where all the transaction data lives */ -struct s_table* _tm_table; /* private internal stuff, don't touch directly */ +extern struct s_table* _tm_table; /* private internal stuff, don't touch + directly */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))

15 years, 8 months

git:master: RURI manipulating functions have been fixed to preserve

by Miklos Tirpak

Module: sip-router Branch: master Commit: 773f8568be5594674a982a981c4bc4b7a6d4eef1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=773f856… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Apr 29 15:55:13 2009 +0200 RURI manipulating functions have been fixed to preserve tel: URI parameters - parameters of a tel: URI embedded in a sip URI had been lost when SET_USER_T action was called for instance. ("sip:123;param=val@foo.com;user=phone" became "sip:456@foo.com;user=phone" after rewriting the user name.) - sip_params variable is added to sip_uri structure to store the original sip: URI parameters. --- action.c | 37 ++++++++++++++++++++++--------------- parser/msg_parser.h | 5 +++++ parser/parse_uri.c | 3 +++ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/action.c b/action.c index 1e89a64..ffc0051 100644 --- a/action.c +++ b/action.c @@ -123,7 +123,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct rvalue* rv1; struct rval_cache c1; str s; - int orig_p2t; /* reset the value of error to E_UNSPEC so avoid unknowledgable functions to return with error (status<0) and not setting it @@ -538,7 +537,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; break; } - if ((msg->parsed_uri_ok==0) || ((uri.flags & URI_SIP_USER_PHONE)!=0)) { + if (msg->parsed_uri_ok==0) { if (msg->new_uri.s) { tmp=msg->new_uri.s; len=msg->new_uri.len; @@ -546,18 +545,12 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) tmp=msg->first_line.u.request.uri.s; len=msg->first_line.u.request.uri.len; } - /* don't convert sip:user=phone to tel, otherwise we loose parameters */ - orig_p2t=phone2tel; - phone2tel=0; - msg->parsed_uri_ok=0; if (parse_uri(tmp, len, &uri)<0){ - phone2tel=orig_p2t; LOG(L_ERR, "ERROR: do_action: bad uri <%s>, dropping" " packet\n", tmp); ret=E_UNSPEC; break; } - phone2tel=orig_p2t; } else { uri=msg->parsed_uri; } @@ -701,6 +694,17 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) *crt=':'; crt++; memcpy(crt,tmp,len);crt+=len; } + /* tel: URI parameters */ + if ((uri.type==TEL_URI_T) + || (uri.type==TELS_URI_T) + ) { + tmp=uri.params.s; + if (tmp){ + len=uri.params.len; if(crt+len+1>end) goto error_uri; + *crt=';'; crt++; + memcpy(crt,tmp,len);crt+=len; + } + } /* host */ if ((a->type==SET_HOST_T) || (a->type==SET_HOSTPORT_T) @@ -747,17 +751,20 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) memcpy(crt,tmp,len);crt+=len; } /* params */ - if ((a->type==SET_HOSTPORTTRANS_T) && uri.transport.s) { + if ((a->type==SET_HOSTPORTTRANS_T) + && uri.sip_params.s + && uri.transport.s + ) { /* bypass the transport parameter */ - if (uri.params.s < uri.transport.s) { + if (uri.sip_params.s < uri.transport.s) { /* there are parameters before transport */ - len = uri.transport.s - uri.params.s - 1; + len = uri.transport.s - uri.sip_params.s - 1; /* ignore the ';' at the end */ if (crt+len+1>end) goto error_uri; *crt=';'; crt++; - memcpy(crt,uri.params.s,len);crt+=len; + memcpy(crt,uri.sip_params.s,len);crt+=len; } - len = (uri.params.s + uri.params.len) - + len = (uri.sip_params.s + uri.sip_params.len) - (uri.transport.s + uri.transport.len); if (len > 0) { /* there are parameters after transport */ @@ -766,9 +773,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) memcpy(crt,tmp,len);crt+=len; } } else { - tmp=uri.params.s; + tmp=uri.sip_params.s; if (tmp){ - len=uri.params.len; if(crt+len+1>end) goto error_uri; + len=uri.sip_params.len; if(crt+len+1>end) goto error_uri; *crt=';'; crt++; memcpy(crt,tmp,len);crt+=len; } diff --git a/parser/msg_parser.h b/parser/msg_parser.h index b8edc6b..ece6b18 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -188,6 +188,11 @@ struct sip_uri { str host; /* Host name */ str port; /* Port number */ str params; /* Parameters */ + str sip_params; /* Parameters of the sip: URI. + * (If a tel: URI is embedded in a sip: URI, then + * params points to the parameters of the tel: URI, + * and sip_params to the parameters of the sip: URI. + */ str headers; unsigned short port_no; unsigned short proto; /* from transport */ diff --git a/parser/parse_uri.c b/parser/parse_uri.c index 85328f8..5b29710 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -1102,6 +1102,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) switch(uri->type){ case SIPS_URI_T: case SIP_URI_T: + /* save the original sip: URI parameters in sip_params */ + uri->sip_params=uri->params; if ((phone2tel) && (uri->user_param_val.len == 5) && (strncmp(uri->user_param_val.s, "phone", 5) == 0) @@ -1120,6 +1122,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) uri->params.len=uri->user.s+uri->user.len-uri->params.s; uri->user.len=p-uri->user.s; } else { + uri->params.s=0; uri->params.len=0; } } else {

15 years, 8 months

git:andrei/type_conversion: script parsing: fix bug in expression error checking

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 36d4ed7ce18f025bc69fb24e1820bcb8ec56984f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36d4ed7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 14:02:16 2009 +0200 script parsing: fix bug in expression error checking - fixed core dump when attempting to continuing script checking after an expression parse error. --- cfg.y | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/cfg.y b/cfg.y index df3056d..f703238 100644 --- a/cfg.y +++ b/cfg.y @@ -1565,7 +1565,10 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { exp: rval_expr { - if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + if ($1==0){ + yyerror("invalid expression"); + $$=0; + }else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ yyerror("invalid expression"); $$=0; }else if (i_tmp!=RV_INT && i_tmp!=RV_NONE){ @@ -2220,9 +2223,9 @@ rval: intno {$$=mk_rve_rval(RV_INT, (void*)$1); } | fcmd {$$=mk_rve_rval(RV_ACTION_ST, $1); } | exp_elem { $$=mk_rve_rval(RV_BEXPR, $1); } | LBRACE actions RBRACE {$$=mk_rve_rval(RV_ACTION_ST, $2); } - | LBRACE error RBRACE { yyerror("bad command block"); } + | LBRACE error RBRACE { $$=0; yyerror("bad command block"); } | LPAREN assign_action RPAREN {$$=mk_rve_rval(RV_ACTION_ST, $2); } - | LPAREN error RPAREN { yyerror("bad expression"); } + | LPAREN error RPAREN { $$=0; yyerror("bad expression"); } ; @@ -2240,10 +2243,11 @@ rve_op: PLUS { $$=RVE_PLUS_OP; } */ rval_expr: rval { $$=$1; - if ($$==0){ + /* if ($$==0){ yyerror("out of memory\n"); YYABORT; } + */ } | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } | rval_expr PLUS rval_expr {$$=mk_rve2(RVE_PLUS_OP, $1, $3); } @@ -2261,7 +2265,7 @@ rval_expr: rval { $$=$1; | STRLEN LPAREN rval_expr RPAREN { $$=mk_rve1(RVE_STRLEN_OP, $3);} | STREMPTY LPAREN rval_expr RPAREN {$$=mk_rve1(RVE_STREMPTY_OP, $3);} | DEFINED rval_expr { $$=mk_rve1(RVE_DEFINED_OP, $2);} - | rve_un_op %prec NOT error { yyerror("bad expression"); } + | rve_un_op %prec NOT error { $$=0; yyerror("bad expression"); } | rval_expr PLUS error { yyerror("bad expression"); } | rval_expr MINUS error { yyerror("bad expression"); } | rval_expr STAR error { yyerror("bad expression"); } @@ -2274,9 +2278,9 @@ rval_expr: rval { $$=$1; { yyerror("bad expression"); } | rval_expr LOG_AND error { yyerror("bad expression"); } | rval_expr LOG_OR error { yyerror("bad expression"); } - | STRLEN LPAREN error RPAREN { yyerror("bad expression"); } - | STREMPTY LPAREN error RPAREN { yyerror("bad expression"); } - | DEFINED error { yyerror("bad expression"); } + | STRLEN LPAREN error RPAREN { $$=0; yyerror("bad expression"); } + | STREMPTY LPAREN error RPAREN { $$=0; yyerror("bad expression"); } + | DEFINED error { $$=0; yyerror("bad expression"); } ; assign_action: lval assign_op rval_expr { $$=mk_action($2, 2, LVAL_ST, $1, @@ -2904,13 +2908,19 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, if ((rve1==0) || (rve2==0)) return 0; + bad_rve=0; + bad_t=0; + exp_t=0; cfg_pos_join(&pos, &rve1->fpos, &rve2->fpos); ret=mk_rval_expr2(op, rve1, rve2, &pos); if (ret && (rve_check_type(&type, ret, &bad_rve, &bad_t, &exp_t)!=1)){ - yyerror_at(&pos, "bad expression: type mismatch:" + if (bad_rve) + yyerror_at(&pos, "bad expression: type mismatch:" " %s instead of %s at (%d,%d)", rval_type_name(bad_t), rval_type_name(exp_t), bad_rve->fpos.s_line, bad_rve->fpos.s_col); + else + yyerror("BUG: unexpected null \"bad\" expression\n"); } return ret; }

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev