sr-dev

sr-dev@lists.kamailio.org

3 participants
45196 discussions

git:kamailio_3.0: sctp: workaround SCTP_DELAYED_SACK lksctp typo
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 1b83a39eafb5c2ff77f3f8028dbcb39e864f3d5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b83a39… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 12 16:24:08 2009 +0100 sctp: workaround SCTP_DELAYED_SACK lksctp typo - workaround typo in linux libsctp api: SCTP_DELAYED_ACK is used/defined instead of SCTP_DELAYED_SACK. - to support older kernels (< 2.6.27), if setting/getting the socket options with SCTP_DELAYED_SACK fails, fallback to SCTP_DELAYED_ACK_TIME for sctp sack_delay and report an error if the user tries to set sack_freq (not supported on older kernels). - split sctp_get_os_default() into sctp_get_os_default() and sctp_get_cfg_from_sock() for debugging purposes. (cherry picked from commit cc16495666e948f2c18dc0bacebecfac85ff59a5) --- sctp_options.c | 48 ++++++++++++----- sctp_options.h | 1 + sctp_server.c | 156 +++++++++++++++++++++++++++++++++++++------------------ sctp_sockopts.h | 44 +++++++++++++++ 4 files changed, 185 insertions(+), 64 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1b8…

1 0

git:kamailio_3.0: core rpc: core.shmmem can take an optional size parameter
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 306ef4698b53fcb616ef53baa7dead895771e46d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=306ef46… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 12 17:24:27 2009 +0100 core rpc: core.shmmem can take an optional size parameter core.shmmem can take now an optional size parameter, which can have one of the following values: b - bytes, k or kb - kilobytes, m or mb - megabytes, g or gb - gigabytes. By default (no parameter) the values displayed are in bytes. Note that when using something different from bytes the value are truncated (no floating point). The new parameter can be used as workaround on 64 bits systems when sr is started with more then 2Gb of memory (due to the RPC interface limitation to int32 in this case the values displayed would be negative or 0). E.g: sercmd> core.shmmem k (cherry picked from commit 02eec212e4eaf999de4162287232c172760ca9d4) --- core_cmd.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 7 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index bc2bd13..ca06bf4 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -435,21 +435,54 @@ static void core_shmmem(rpc_t* rpc, void* c) { struct mem_info mi; void *handle; - + char* param; + long rs; + + rs=0; + /* look for optional size/divisor parameter */ + if (rpc->scan(c, "*s", &param)>0){ + switch(*param){ + case 'b': + case 'B': + rs=0; + break; + case 'k': + case 'K': + rs=10; /* K -> 1024 */ + break; + case 'm': + case 'M': + rs=20; /* M -> 1048576 */ + break; + case 'g': + case 'G': + rs=30; /* G -> 1024M */ + break; + default: + rpc->fault(c, 500, "bad param, (use b|k|m|g)"); + return; + } + if (param[1] && ((param[1]!='b' && param[1]!='B') || param[2])){ + rpc->fault(c, 500, "bad param, (use b|k|m|g)"); + return; + } + } shm_info(&mi); rpc->add(c, "{", &handle); rpc->struct_add(handle, "dddddd", - "total", (unsigned int)mi.total_size, - "free", (unsigned int)mi.free, - "used", (unsigned int)mi.used, - "real_used",(unsigned int)mi.real_used, - "max_used", (unsigned int)mi.max_used, + "total", (unsigned int)(mi.total_size>>rs), + "free", (unsigned int)(mi.free>>rs), + "used", (unsigned int)(mi.used>>rs), + "real_used",(unsigned int)(mi.real_used>>rs), + "max_used", (unsigned int)(mi.max_used>>rs), "fragments", (unsigned int)mi.total_frags ); } static const char* core_shmmem_doc[] = { - "Returns shared memory info.", /* Documentation string */ + "Returns shared memory info. It has an optional parameter that specifies" + " the measuring unit: b - bytes (default), k or kb, m or mb, g or gb. " + "Note: when using something different from bytes, the value is truncated.", 0 /* Method signature(s) */ };

1 0

git:kamailio_3.0: make: db_flatstore moved in the standard package
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: c25d7a7a03cedee7d691196aff3549a1239d4e5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c25d7a7… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 11 19:47:28 2009 +0100 make: db_flatstore moved in the standard package db_flatstore was in db_modules package and ser standard package. I think it should be removed from db_modules packages as it does not have any dependencies on db-libraries. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit efaf2651e318574289579730c93d6a73d4734de4) --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 6d8c9f3..9c1f2b3 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \ presence_b2b rls speeddial uri_db xcap xmlrpc # For db use (db modules, excluding drivers) -module_group_db=acc_db auth_db avp_db db_ops db_flatstore db_text \ +module_group_db=acc_db auth_db avp_db db_ops db_text \ uri_db domain lcr msilo speeddial #dbtext (s) not migrated yet to the new db interface

1 0

git:kamailio_3.0: deb: fix mysql scripts install path problem
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: c23c5575a0019cd7ba6f44b34dfc96c8f74114c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c23c557… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 11 19:52:55 2009 +0100 deb: fix mysql scripts install path problem Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit cc88ded53d3ba8e8140390f33f3759a127ad9dbd) --- pkg/debian/rules | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/debian/rules b/pkg/debian/rules index 289ec3e..3d708f3 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -179,10 +179,10 @@ install: build mkdir -p $(CURDIR)/debian/ser/etc/default cp -f debian/ser.default $(CURDIR)/debian/ser/etc/default/ser # install the *.sql files for ser_mysql.sh script - cp -f scripts/mysql/*.sql $(CURDIR)/debian/ser/usr/lib/ser/ + cp -f scripts/mysql/*.sql $(CURDIR)/debian/ser-mysql-module/usr/lib/ser/ # and fix path to the *.sql files in ser_mysql.sh script sed -i 's#DEFAULT_SCRIPT_DIR=.*#DEFAULT_SCRIPT_DIR="/usr/lib/ser/"#' \ - $(CURDIR)/debian/ser/usr/sbin/ser_mysql.sh + $(CURDIR)/debian/ser-mysql-module/usr/sbin/ser_mysql.sh # install advanced ser config file for ser-oob package mkdir -p $(CURDIR)/debian/ser-oob/etc/ser cp -f etc/sip-router-oob.cfg $(CURDIR)/debian/ser-oob/etc/ser/ser-oob.cfg

1 0

git:sr_3.0: * modules_k/nathelper
by Juha Heinanen 15 Nov '09

15 Nov '09

Module: sip-router Branch: sr_3.0 Commit: a85444180860da454831c5c0b366a6cc2f7f189f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a854441… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Nov 16 00:45:27 2009 +0200 * modules_k/nathelper Added two new functions add_contact_alias() and handle_ruri_alias() and two new pseudo variables $rr_count and $rr_top_count that can be used to implement tcp connection sharing and produce correct Request URI for in-dialog requests to NATed UAs. --- modules_k/nathelper/README | 871 ++++++++++++++++----------- modules_k/nathelper/doc/nathelper.xml | 19 + modules_k/nathelper/doc/nathelper_admin.xml | 127 ++++- modules_k/nathelper/nathelper.c | 297 +++++++++- 4 files changed, 959 insertions(+), 355 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a85…

1 0

git:sr_3.0: print the cfg file in fixup error message
by Juha Heinanen 15 Nov '09

15 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 0fdf0f2913b2e8e35026a8fd1c88ba09d9f7f19a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fdf0f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Nov 15 14:32:40 2009 +0100 print the cfg file in fixup error message - line is not enough when include_file is used --- route.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/route.c b/route.c index 8887c8a..1aeb529 100644 --- a/route.c +++ b/route.c @@ -1022,7 +1022,8 @@ int fix_actions(struct action* a) return 0; error: - LM_ERR("fixing failed (code=%d) at cfg line %d\n", ret, t->cline); + LM_ERR("fixing failed (code=%d) at cfg:%s:%d\n", ret, + (t->cfile)?t->cfile:"", t->cline); return ret; }

1 0

git:sr_3.0: print line for fixing action error
by Juha Heinanen 15 Nov '09

15 Nov '09

Module: sip-router Branch: sr_3.0 Commit: c57e33e33b8b46ffb2d97fba55011b214dd4a4c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c57e33e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Nov 15 12:51:27 2009 +0100 print line for fixing action error - reported by Juha Heinanen --- route.c | 109 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 39 deletions(-) diff --git a/route.c b/route.c index 8d6f2c6..8887c8a 100644 --- a/route.c +++ b/route.c @@ -657,7 +657,8 @@ int fix_actions(struct action* a) if (tmp==0){ LOG(L_CRIT, "ERROR: fix_actions:" "memory allocation failure\n"); - return E_OUT_OF_MEM; + ret = E_OUT_OF_MEM; + goto error; } t->val[0].type=STRING_ST; t->val[0].u.string=tmp; @@ -666,7 +667,7 @@ int fix_actions(struct action* a) s.s = t->val[0].u.string; s.len = strlen(s.s); p=add_proxy(&s, t->val[1].u.number, 0); /* FIXME proto*/ - if (p==0) return E_BAD_ADDRESS; + if (p==0) { ret =E_BAD_ADDRESS; goto error; } t->val[0].u.data=p; t->val[0].type=PROXY_ST; break; @@ -676,7 +677,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid type" "%d (should be string or number)\n", t->type); - return E_BUG; + ret = E_BUG; + goto error; } break; case IF_T: @@ -684,19 +686,22 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if (should be rval expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if( (t->val[1].type!=ACTIONS_ST) && (t->val[1].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {...} (should be action)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; }else if( (t->val[2].type!=ACTIONS_ST) && (t->val[2].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {} else{...}(should be action)\n", t->val[2].type); - return E_BUG; + ret = E_BUG; + goto error; } rve=(struct rval_expr*)t->val[0].u.data; if (rve){ @@ -715,7 +720,8 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } /* it's not an error anymore to have non-int in an if, only a script warning (to allow backward compat. stuff @@ -728,16 +734,16 @@ int fix_actions(struct action* a) } */ if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ if ((ret=fix_actions((struct action*)t->val[1].u.data))<0) - return ret; + goto error; } if ( (t->val[2].type==ACTIONS_ST)&&(t->val[2].u.data) ){ if ((ret=fix_actions((struct action*)t->val[2].u.data)) <0) - return ret; + goto error; } break; case SWITCH_T: @@ -745,35 +751,40 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for switch() (should be expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if (t->val[1].type!=CASE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for switch(...){...}(should be case)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } if (t->val[0].u.data){ if ((ret=fix_rval_expr(&t->val[0].u.data))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null switch()" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } if ((ret=fix_switch(t))<0) - return ret; + goto error; break; case WHILE_T: if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for while() (should be expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if (t->val[1].type!=ACTIONS_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for while(...){...}(should be action)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } rve=(struct rval_expr*)t->val[0].u.data; if (rve){ @@ -792,24 +803,27 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if (rve_type!=RV_INT && rve_type!=RV_NONE){ LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" " bad type, integer expected\n", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null while()" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } if ( t->val[1].u.data && ((ret= fix_actions((struct action*)t->val[1].u.data))<0)){ - return ret; + goto error; } break; case DROP_T: @@ -833,20 +847,23 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if (rve_type!=RV_INT && rve_type!=RV_NONE){ LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" " bad type, integer expected\n", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null drop/return" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } break; case ASSIGN_T: @@ -854,12 +871,14 @@ int fix_actions(struct action* a) if (t->val[0].type !=LVAL_ST) { LOG(L_CRIT, "BUG: fix_actions: Invalid left side of" " assignment\n"); - return E_BUG; + ret = E_BUG; + goto error; } if (t->val[1].type !=RVE_ST) { LOG(L_CRIT, "BUG: fix_actions: Invalid right side of" " assignment (%d)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } lval=t->val[0].u.data; if (lval->type==LV_AVP){ @@ -867,16 +886,18 @@ int fix_actions(struct action* a) LOG(L_ERR, "ERROR: You cannot change domain" " attributes from the script, they are" " read-only\n"); - return E_BUG; + ret = E_BUG; + goto error; } else if (lval->lv.avps.type & AVP_CLASS_GLOBAL) { LOG(L_ERR, "ERROR: You cannot change global" " attributes from the script, they are" "read-only\n"); - return E_BUG; + ret = E_BUG; + goto error; } } if ((ret=fix_rval_expr(&t->val[1].u.data))<0) - return ret; + goto error; break; case MODULE_T: @@ -891,7 +912,7 @@ int fix_actions(struct action* a) if (t->val[1].u.number==0) { ret = cmd->c.fixup(0, 0); if (ret < 0) - return ret; + goto error; } /* type cast NUMBER to STRING, old modules may expect * all STRING params during fixup */ @@ -904,7 +925,8 @@ int fix_actions(struct action* a) if (!t->val[i+2].u.string) { LOG(L_CRIT, "ERROR: cannot translate NUMBER" " to STRING\n"); - return E_OUT_OF_MEM; + ret = E_OUT_OF_MEM; + goto error; } strcpy(t->val[i+2].u.string, buf); t->val[i+2].type = STRING_ST; @@ -917,7 +939,7 @@ int fix_actions(struct action* a) if (t->val[i+2].u.data != p) t->val[i+2].type = MODFIXUP_ST; if (ret < 0) - return ret; + goto error; } } break; @@ -926,7 +948,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for force_send_socket\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } he=resolvehost( ((struct socket_id*)t->val[0].u.data)->addr_lst->name @@ -935,7 +958,8 @@ int fix_actions(struct action* a) LOG(L_ERR, "ERROR: fix_actions: force_send_socket:" " could not resolve %s\n", ((struct socket_id*)t->val[0].u.data)->addr_lst->name); - return E_BAD_ADDRESS; + ret = E_BAD_ADDRESS; + goto error; } hostent2ip_addr(&ip, he, 0); si=find_si(&ip, ((struct socket_id*)t->val[0].u.data)->port, @@ -945,7 +969,8 @@ int fix_actions(struct action* a) " argument: %s:%d (ser doesn't listen on it)\n", ((struct socket_id*)t->val[0].u.data)->addr_lst->name, ((struct socket_id*)t->val[0].u.data)->port); - return E_BAD_ADDRESS; + ret = E_BAD_ADDRESS; + goto error; } t->val[0].u.data=si; t->val[0].type=SOCKETINFO_ST; @@ -955,7 +980,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for udp_mtu_try_proto\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } switch(t->val[0].u.number){ case PROTO_UDP: @@ -980,7 +1006,8 @@ int fix_actions(struct action* a) if (t->val[0].type!=STRING_ST){ BUG("invalid subtype%d for append_branch_t\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } s.s=t->val[0].u.string; s.len=(s.s)?strlen(s.s):0; @@ -993,6 +1020,10 @@ int fix_actions(struct action* a) } } return 0; + +error: + LM_ERR("fixing failed (code=%d) at cfg line %d\n", ret, t->cline); + return ret; }

1 0

git:kamailio_3.0: print the cfg file in fixup error message
by Daniel-Constantin Mierla 15 Nov '09

15 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 33bfc5aeeaa55c93842635bb41da30745673854b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33bfc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 15 14:32:40 2009 +0100 print the cfg file in fixup error message - line is not enough when include_file is used --- route.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/route.c b/route.c index 8887c8a..1aeb529 100644 --- a/route.c +++ b/route.c @@ -1022,7 +1022,8 @@ int fix_actions(struct action* a) return 0; error: - LM_ERR("fixing failed (code=%d) at cfg line %d\n", ret, t->cline); + LM_ERR("fixing failed (code=%d) at cfg:%s:%d\n", ret, + (t->cfile)?t->cfile:"", t->cline); return ret; }

1 0

git:kamailio_3.0: uac(k): use type to detect www/proxy_authenticate hdrs
by Daniel-Constantin Mierla 15 Nov '09

15 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: c92e49f3eb145c3767e996d21717d20613a899d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c92e49f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 15 12:52:36 2009 +0100 uac(k): use type to detect www/proxy_authenticate hdrs - reported by Mangust (mangust2), SF.net #2897594 --- modules_k/uac/auth.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/uac/auth.c b/modules_k/uac/auth.c index ba0e3fc..78f51d5 100644 --- a/modules_k/uac/auth.c +++ b/modules_k/uac/auth.c @@ -232,9 +232,9 @@ static inline struct hdr_field *get_autenticate_hdr(struct sip_msg *rpl, } for( hdr=rpl->headers ; hdr ; hdr=hdr->next ) { - if ( hdr->type!=HDR_OTHER_T ) - continue; - if (cmp_hdrname_str(&hdr->name, &hdr_name)==0) + if((rpl_code==WWW_AUTH_CODE && hdr->type==HDR_WWW_AUTHENTICATE_T) + || (rpl_code==PROXY_AUTH_CODE + && hdr->type==HDR_PROXY_AUTHENTICATE_T)) return hdr; }

1 0

git:kamailio_3.0: print line for fixing action error
by Daniel-Constantin Mierla 15 Nov '09

15 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 208e5c3d910885efc83acab4f06b66b27685332c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=208e5c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 15 12:51:27 2009 +0100 print line for fixing action error - reported by Juha Heinanen --- route.c | 109 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 39 deletions(-) diff --git a/route.c b/route.c index 8d6f2c6..8887c8a 100644 --- a/route.c +++ b/route.c @@ -657,7 +657,8 @@ int fix_actions(struct action* a) if (tmp==0){ LOG(L_CRIT, "ERROR: fix_actions:" "memory allocation failure\n"); - return E_OUT_OF_MEM; + ret = E_OUT_OF_MEM; + goto error; } t->val[0].type=STRING_ST; t->val[0].u.string=tmp; @@ -666,7 +667,7 @@ int fix_actions(struct action* a) s.s = t->val[0].u.string; s.len = strlen(s.s); p=add_proxy(&s, t->val[1].u.number, 0); /* FIXME proto*/ - if (p==0) return E_BAD_ADDRESS; + if (p==0) { ret =E_BAD_ADDRESS; goto error; } t->val[0].u.data=p; t->val[0].type=PROXY_ST; break; @@ -676,7 +677,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid type" "%d (should be string or number)\n", t->type); - return E_BUG; + ret = E_BUG; + goto error; } break; case IF_T: @@ -684,19 +686,22 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if (should be rval expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if( (t->val[1].type!=ACTIONS_ST) && (t->val[1].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {...} (should be action)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; }else if( (t->val[2].type!=ACTIONS_ST) && (t->val[2].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {} else{...}(should be action)\n", t->val[2].type); - return E_BUG; + ret = E_BUG; + goto error; } rve=(struct rval_expr*)t->val[0].u.data; if (rve){ @@ -715,7 +720,8 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } /* it's not an error anymore to have non-int in an if, only a script warning (to allow backward compat. stuff @@ -728,16 +734,16 @@ int fix_actions(struct action* a) } */ if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ if ((ret=fix_actions((struct action*)t->val[1].u.data))<0) - return ret; + goto error; } if ( (t->val[2].type==ACTIONS_ST)&&(t->val[2].u.data) ){ if ((ret=fix_actions((struct action*)t->val[2].u.data)) <0) - return ret; + goto error; } break; case SWITCH_T: @@ -745,35 +751,40 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for switch() (should be expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if (t->val[1].type!=CASE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for switch(...){...}(should be case)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } if (t->val[0].u.data){ if ((ret=fix_rval_expr(&t->val[0].u.data))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null switch()" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } if ((ret=fix_switch(t))<0) - return ret; + goto error; break; case WHILE_T: if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for while() (should be expr)\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; }else if (t->val[1].type!=ACTIONS_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for while(...){...}(should be action)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } rve=(struct rval_expr*)t->val[0].u.data; if (rve){ @@ -792,24 +803,27 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if (rve_type!=RV_INT && rve_type!=RV_NONE){ LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" " bad type, integer expected\n", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null while()" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } if ( t->val[1].u.data && ((ret= fix_actions((struct action*)t->val[1].u.data))<0)){ - return ret; + goto error; } break; case DROP_T: @@ -833,20 +847,23 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if (rve_type!=RV_INT && rve_type!=RV_NONE){ LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" " bad type, integer expected\n", rve->fpos.s_line, rve->fpos.s_col); - return E_UNSPEC; + ret = E_UNSPEC; + goto error; } if ((ret=fix_rval_expr((void**)&rve))<0) - return ret; + goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null drop/return" " expression\n"); - return E_BUG; + ret = E_BUG; + goto error; } break; case ASSIGN_T: @@ -854,12 +871,14 @@ int fix_actions(struct action* a) if (t->val[0].type !=LVAL_ST) { LOG(L_CRIT, "BUG: fix_actions: Invalid left side of" " assignment\n"); - return E_BUG; + ret = E_BUG; + goto error; } if (t->val[1].type !=RVE_ST) { LOG(L_CRIT, "BUG: fix_actions: Invalid right side of" " assignment (%d)\n", t->val[1].type); - return E_BUG; + ret = E_BUG; + goto error; } lval=t->val[0].u.data; if (lval->type==LV_AVP){ @@ -867,16 +886,18 @@ int fix_actions(struct action* a) LOG(L_ERR, "ERROR: You cannot change domain" " attributes from the script, they are" " read-only\n"); - return E_BUG; + ret = E_BUG; + goto error; } else if (lval->lv.avps.type & AVP_CLASS_GLOBAL) { LOG(L_ERR, "ERROR: You cannot change global" " attributes from the script, they are" "read-only\n"); - return E_BUG; + ret = E_BUG; + goto error; } } if ((ret=fix_rval_expr(&t->val[1].u.data))<0) - return ret; + goto error; break; case MODULE_T: @@ -891,7 +912,7 @@ int fix_actions(struct action* a) if (t->val[1].u.number==0) { ret = cmd->c.fixup(0, 0); if (ret < 0) - return ret; + goto error; } /* type cast NUMBER to STRING, old modules may expect * all STRING params during fixup */ @@ -904,7 +925,8 @@ int fix_actions(struct action* a) if (!t->val[i+2].u.string) { LOG(L_CRIT, "ERROR: cannot translate NUMBER" " to STRING\n"); - return E_OUT_OF_MEM; + ret = E_OUT_OF_MEM; + goto error; } strcpy(t->val[i+2].u.string, buf); t->val[i+2].type = STRING_ST; @@ -917,7 +939,7 @@ int fix_actions(struct action* a) if (t->val[i+2].u.data != p) t->val[i+2].type = MODFIXUP_ST; if (ret < 0) - return ret; + goto error; } } break; @@ -926,7 +948,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for force_send_socket\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } he=resolvehost( ((struct socket_id*)t->val[0].u.data)->addr_lst->name @@ -935,7 +958,8 @@ int fix_actions(struct action* a) LOG(L_ERR, "ERROR: fix_actions: force_send_socket:" " could not resolve %s\n", ((struct socket_id*)t->val[0].u.data)->addr_lst->name); - return E_BAD_ADDRESS; + ret = E_BAD_ADDRESS; + goto error; } hostent2ip_addr(&ip, he, 0); si=find_si(&ip, ((struct socket_id*)t->val[0].u.data)->port, @@ -945,7 +969,8 @@ int fix_actions(struct action* a) " argument: %s:%d (ser doesn't listen on it)\n", ((struct socket_id*)t->val[0].u.data)->addr_lst->name, ((struct socket_id*)t->val[0].u.data)->port); - return E_BAD_ADDRESS; + ret = E_BAD_ADDRESS; + goto error; } t->val[0].u.data=si; t->val[0].type=SOCKETINFO_ST; @@ -955,7 +980,8 @@ int fix_actions(struct action* a) LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for udp_mtu_try_proto\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } switch(t->val[0].u.number){ case PROTO_UDP: @@ -980,7 +1006,8 @@ int fix_actions(struct action* a) if (t->val[0].type!=STRING_ST){ BUG("invalid subtype%d for append_branch_t\n", t->val[0].type); - return E_BUG; + ret = E_BUG; + goto error; } s.s=t->val[0].u.string; s.len=(s.s)?strlen(s.s):0; @@ -993,6 +1020,10 @@ int fix_actions(struct action* a) } } return 0; + +error: + LM_ERR("fixing failed (code=%d) at cfg line %d\n", ret, t->cline); + return ret; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev