sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

[tracker] Comment added: Error in generating Publush with state confirmed at recived 200OK package.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#187 - Error in generating Publush with state confirmed at recived 200OK package. User who did this - Tomek Kotecki (koteckit) ---------- We noticed the problem in the function of the switch and applied the patch: +--- kamailio-3.2.1/modules_k/pua_dialoginfo/pua_dialoginfo.c 2011-12-01 14:31:12.000000000 +0000 ++++ kamailio-3.2.1-new/modules_k/pua_dialoginfo/pua_dialoginfo.c 2011-12-27 13:28:26.970458641 +0000 +@@ -230,6 +230,7 @@ + break; + case DLGCB_CONFIRMED: + case DLGCB_REQ_WITHIN: ++ case DLGCB_CONFIRMED_NA: + LM_DBG("dialog confirmed, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); + dialog_publish("confirmed", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0, &target, &(dlginfo->from_contact)); Patch solves the problem. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=187#comment476 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.

12 years, 10 months

git:master: modules: fixed several compile warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7400516f1e301226136604c520291924a83dec8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7400516… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 27 11:46:37 2011 +0100 modules: fixed several compile warnings - removed unused variables, initialized some --- modules/avpops/avpops.c | 2 -- modules/avpops/avpops_impl.c | 2 -- modules/mi_rpc/mi_rpc_mod.c | 2 -- modules/mtree/mtree.c | 3 --- modules/sdpops/sdpops_mod.c | 3 --- modules/sms/sms_funcs.c | 3 --- modules_k/dispatcher/dispatch.c | 2 -- modules_k/imc/imc_mng.c | 4 ++-- modules_k/kex/core_stats.c | 8 +++----- modules_k/mi_datagram/datagram_fnc.c | 3 +-- modules_k/presence_profile/presence_profile.c | 2 +- modules_k/siptrace/siptrace.c | 2 -- modules_k/tmx/t_mi.c | 2 ++ 13 files changed, 9 insertions(+), 29 deletions(-) diff --git a/modules/avpops/avpops.c b/modules/avpops/avpops.c index 440c8f6..4de02a1 100644 --- a/modules/avpops/avpops.c +++ b/modules/avpops/avpops.c @@ -213,12 +213,10 @@ static int fixup_db_avp(void** param, int param_no, int allow_scheme) struct fis_param *sp; struct db_param *dbp; int flags; - int flags0; str s; char *p; flags=0; - flags0=0; if (db_url.s==0) { LM_ERR("you have to configure a db_url for using avp_db_xxx functions\n"); diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index bf1e822..09d6769 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -1469,7 +1469,6 @@ int ops_op_avp( struct sip_msg* msg, struct fis_param** av, int_str avp_name3; int_str avp_val; int_str op_val; - int op_flags; int result; pv_value_t xvalue; @@ -1526,7 +1525,6 @@ cycle1: if (val->opd&AVPOPS_VAL_PVAR) { /* the 2nd operator is variable -> get value */ - op_flags = 0; if(val->u.sval.type==PVT_AVP) { /* search for the avp */ diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index aeabddd..4bcd7c6 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -501,7 +501,6 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) str *fn; struct mi_node *node; - int len; char *command = NULL; int param_count = 0; char **parameters = NULL; @@ -530,7 +529,6 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) return( init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN )); fn = &node->value; - len = fn->len +1; /* find_rpc_exports needs 0 terminated strings */ command = pkg_malloc(fn->len+1); diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 351dfae..8b83cd9 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -385,7 +385,6 @@ int mt_match_prefix(struct sip_msg *msg, m_tree_t *it, int l, len, n; int i, j; mt_node_t *itn; - int ret; is_t *tvalue; int_str dstid_avp_name; unsigned short dstid_name_type; @@ -405,8 +404,6 @@ int mt_match_prefix(struct sip_msg *msg, m_tree_t *it, return -1; } - ret = 0; - l = len = 0; n = 0; if ((it->type==MT_TREE_SVAL) || (it->type==MT_TREE_IVAL)) { diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index be2e840..c2d9e9f 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -595,7 +595,6 @@ static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char* media) */ static int sdp_with_media(sip_msg_t *msg, str *media) { - sdp_info_t *sdp = NULL; int sdp_session_num; int sdp_stream_num; sdp_session_cell_t* sdp_session; @@ -609,8 +608,6 @@ static int sdp_with_media(sip_msg_t *msg, str *media) LM_DBG("attempting to search for media type: [%.*s]\n", media->len, media->s); - sdp = (sdp_info_t*)msg->body; - sdp_session_num = 0; for(;;) { diff --git a/modules/sms/sms_funcs.c b/modules/sms/sms_funcs.c index 9a4afa6..5561301 100644 --- a/modules/sms/sms_funcs.c +++ b/modules/sms/sms_funcs.c @@ -65,7 +65,6 @@ struct network networks[MAX_NETWORKS]; int net_pipes_in[MAX_NETWORKS]; int nr_of_networks; int nr_of_modems; -int max_sms_parts; int *queued_msgs; int use_contact; struct tm_binds tmb; @@ -545,7 +544,6 @@ int send_sms_as_sip( struct incame_sms *sms ) str sip_body; str sip_from; int is_pattern; - int in_address; int k; char *p; @@ -559,7 +557,6 @@ int send_sms_as_sip( struct incame_sms *sms ) sip address inside; everything before it is ignored, only the part following the address being send as sip */ - in_address = 0; sip_addr.len = 0; sip_body.len = 0; p = sms->ascii; diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 4cd57a2..7547897 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1511,7 +1511,6 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) { struct action act; struct run_act_ctx ra_ctx; - str *duri = NULL; switch(mode) { case 1: @@ -1530,7 +1529,6 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) } break; default: - duri = uri; if (set_dst_uri(msg, uri) < 0) { LM_ERR("error while setting dst uri\n"); return -1; diff --git a/modules_k/imc/imc_mng.c b/modules_k/imc/imc_mng.c index 1c739e6..e82b267 100644 --- a/modules_k/imc/imc_mng.c +++ b/modules_k/imc/imc_mng.c @@ -88,7 +88,7 @@ error: */ int imc_htable_destroy(void) { - int i,room_deleted; + int i; imc_room_p irp = NULL, irp_temp=NULL; if(_imc_htable==NULL) return -1; @@ -101,7 +101,7 @@ int imc_htable_destroy(void) irp = _imc_htable[i].rooms; while(irp){ irp_temp = irp->next; - room_deleted = imc_del_room(&irp->name, &irp->domain); + imc_del_room(&irp->name, &irp->domain); irp = irp_temp; } } diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 009a906..6b77ae1 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -221,10 +221,9 @@ inline static int mi_add_stat(struct mi_node *rpl, stat_var *stat) static void mi_add_grp_vars_cbk(void* r, str* g, str* n, counter_handle_t h) { struct mi_node *rpl; - struct mi_node *node; rpl = r; - node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", g->len, g->s, n->len, n->s, counter_get_val(h)); } @@ -365,7 +364,6 @@ inline static int mi_reset_and_add_stat(struct mi_node *rpl, stat_var *stat) static void mi_add_grp_vars_cbk2(void* r, str* g, str* n, counter_handle_t h) { struct mi_node *rpl; - struct mi_node *node; counter_val_t old_val, new_val; rpl = r; @@ -375,10 +373,10 @@ static void mi_add_grp_vars_cbk2(void* r, str* g, str* n, counter_handle_t h) if (old_val==new_val) { - node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", g->len, g->s, n->len, n->s, new_val); } else { - node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu (%lu)", + addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu (%lu)", g->len, g->s, n->len, n->s, new_val, old_val); } } diff --git a/modules_k/mi_datagram/datagram_fnc.c b/modules_k/mi_datagram/datagram_fnc.c index e93949a..9ca206c 100644 --- a/modules_k/mi_datagram/datagram_fnc.c +++ b/modules_k/mi_datagram/datagram_fnc.c @@ -263,11 +263,10 @@ static int mi_send_dgram(int fd, char* buf, unsigned int len, * line is correct and exists*/ static int identify_command(datagram_stream * dtgram, struct mi_cmd * *f) { - char *command,*p, *start; + char *command,*p; /* default offset for the command: 0 */ p= dtgram->start; - start = p; if (!p){ LM_ERR("null pointer \n"); return -1; diff --git a/modules_k/presence_profile/presence_profile.c b/modules_k/presence_profile/presence_profile.c index 686dbd5..55f8902 100644 --- a/modules_k/presence_profile/presence_profile.c +++ b/modules_k/presence_profile/presence_profile.c @@ -105,7 +105,7 @@ static int mod_init(void) } pres_add_event = pres.add_event; - if (add_event == NULL) { + if (pres_add_event == NULL) { LM_ERR("could not import add_event\n"); return -1; } diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index a912fb4..d845ae8 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -1279,7 +1279,6 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) { sip_msg_t *req; struct _siptrace_data sto; - int faked = 0; struct sip_msg* msg; struct ip_addr to_ip; int len; @@ -1303,7 +1302,6 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) } msg = req; - faked = 1; if(sip_trace_prepare(msg)<0) return; diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 4e31220..dd20fcc 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -477,6 +477,8 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) if ( !(n==5 || n==6) || node!=0) return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + cseq = -1; + /* method name (param 1) */ node = cmd_tree->node.kids; method = &node->value;

12 years, 10 months

lcr module and IPv6

by Andreas Granig

All, Just realized that lcr module does not support IPv6 yet. Is there already any work going on here? Otherwise we'd take this task over. Andreas

12 years, 11 months

git:master: permissions(k): support for ipv6 in address-related functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7d4536e28cc4d3487121be613046bbfc9c3005df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d4536e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:35:02 2011 +0100 permissions(k): support for ipv6 in address-related functions --- modules_k/permissions/address.c | 528 ++++++++++++++++++----------------- modules_k/permissions/hash.c | 462 +++++++++++++++---------------- modules_k/permissions/hash.h | 16 +- modules_k/permissions/permissions.c | 394 ++++++++++++++------------- 4 files changed, 704 insertions(+), 696 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7d4…

12 years, 11 months

No memory left in send_subscribe (PUA) from update_pua while building the tm dlg_t structure

by laura testi

Hi, we are using the PUA_XMPP and PUA modules from the master branch. When the modules are started, everything are ok, the presence events from XMPP are sent to kamailio SIP servers (PUBLISH/SUBSCRIBE) and cached in the hash. But when there are several thousands records in the hash tabel, the update_pua function called in the hashT_clean gives a lot of "No memory left" error when the hashT_clean is waked up from the time: ERROR: pua [send_subscribe.c]: No memory left ERROR: pua [pua.c]: while building tm dlg_t structure The failed call is: td = (dlg_t*)pkg_malloc(size); if(td == NULL) { LM_ERR("No memory left\n"); return NULL; } in dlg_t* pua_build_dlg_t(ua_pres_t* presentity) function in send_subscribe.c. The size is about 400 and something... It's strange..... Is it the memory leak in the PUA module? I also try to increase the pkg_memory from 4MB default to 16MB, but it doesn't help. Any Idea? Thanks in advanced Laura

12 years, 11 months

git:master: pua: free parsed rr when sending subscribes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1b3cfa60a5b5c7d435704d44b7c495b7e6aa84c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b3cfa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 12:48:42 2011 +0100 pua: free parsed rr when sending subscribes - reported by Laura Testi --- modules_k/pua/send_subscribe.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 50560db..8d358a3 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -897,6 +897,8 @@ int send_subscribe(subs_info_t* subs) db1_res_t *res=NULL; ua_pres_t dbpres; str pres_uri={0,0}, watcher_uri={0,0}, extra_headers={0,0}; + dlg_t* td= NULL; + memset(&dbpres, 0, sizeof(dbpres)); dbpres.pres_uri = &pres_uri; @@ -1120,8 +1122,6 @@ insert: } */ - dlg_t* td= NULL; - if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) { LM_INFO("attempting to re-SUBSCRIBE on internal (rls_update_subs()) update - skipping\n"); @@ -1170,14 +1170,16 @@ insert: LM_ERR("while sending request with t_request\n"); goto done; } + } + +done: + if(td!=NULL) { if(td->route_set) free_rr(&td->route_set); pkg_free(td); td= NULL; } - -done: pkg_free(str_hdr); free_results_puadb(res); return ret;

12 years, 11 months

git:master: pua(k): use dedicated function to free tm dlg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 464897bd3d4713e7a30c4e505449942e4251b328 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=464897b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 13:16:46 2011 +0100 pua(k): use dedicated function to free tm dlg --- modules_k/pua/send_subscribe.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 8d358a3..a3b647c 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -212,6 +212,20 @@ dlg_t* pua_build_dlg_t(ua_pres_t* presentity) return td; } +/** + * free the field in dlg_t as filled/allocated by this module + */ +static int pua_free_tm_dlg(dlg_t *td) +{ + if(td) + { + if(td->route_set) + free_rr(&td->route_set); + pkg_free(td); + } + return 0; +} + void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { struct sip_msg* msg= NULL; @@ -882,6 +896,10 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) } + +/** + * + */ int send_subscribe(subs_info_t* subs) { ua_pres_t* presentity= NULL; @@ -1174,12 +1192,7 @@ insert: done: - if(td!=NULL) { - if(td->route_set) - free_rr(&td->route_set); - pkg_free(td); - td= NULL; - } + pua_free_tm_dlg(td); pkg_free(str_hdr); free_results_puadb(res); return ret;

12 years, 11 months

git:master: presence(k): renamed tm dlg functions to avoid potential conflicts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 57d3284f21b7ea6f78386ffbaface49dfa9cdcec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57d3284… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 13:16:15 2011 +0100 presence(k): renamed tm dlg functions to avoid potential conflicts --- modules_k/presence/notify.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index d1b92f6..b4e4b44 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -913,7 +913,7 @@ void free_notify_body(str *body, pres_ev_t *ev) } } -int free_tm_dlg(dlg_t *td) +static int ps_free_tm_dlg(dlg_t *td) { if(td) { @@ -929,7 +929,7 @@ int free_tm_dlg(dlg_t *td) return 0; } -dlg_t* build_dlg_t(subs_t* subs) +dlg_t* ps_build_dlg_t(subs_t* subs) { dlg_t* td =NULL; int found_contact = 1; @@ -1009,7 +1009,7 @@ dlg_t* build_dlg_t(subs_t* subs) return td; error: - free_tm_dlg(td); + ps_free_tm_dlg(td); return NULL; } @@ -1562,7 +1562,7 @@ jump_over_body: LM_DBG("headers:\n%.*s\n", str_hdr.len, str_hdr.s); /* construct the dlg_t structure */ - td = build_dlg_t(subs); + td = ps_build_dlg_t(subs); if(td ==NULL) { LM_ERR("while building dlg_t structure\n"); @@ -1592,7 +1592,7 @@ jump_over_body: td->loc_uri.len, td->loc_uri.s, subs->event->name.len, subs->event->name.s); - free_tm_dlg(td); + ps_free_tm_dlg(td); if(str_hdr.s) pkg_free(str_hdr.s); @@ -1602,7 +1602,7 @@ jump_over_body: return 0; error: - free_tm_dlg(td); + ps_free_tm_dlg(td); if(str_hdr.s!=NULL) pkg_free(str_hdr.s); if((int)(long)n_body!= (int)(long)notify_body)

12 years, 11 months

git:tma0/iptrtpproxy-ip6: Support for IPv6

by Tomas Mandys

Module: sip-router Branch: tma0/iptrtpproxy-ip6 Commit: f8916abf6b07e54a043171ddc55dc05bbddc7076 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8916ab… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Fri Dec 23 11:57:13 2011 +0100 Support for IPv6 Added support for IPv6, requires xt_RTPPROXY module supporting IPv6 --- modules/iptrtpproxy/Makefile | 2 +- modules/iptrtpproxy/README | 393 ++++++++++++++++++++++++++----- modules/iptrtpproxy/doc/iptrtpproxy.xml | 30 +++ modules/iptrtpproxy/iptrtpproxy.c | 225 ++++++++++-------- 4 files changed, 486 insertions(+), 164 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f89…

12 years, 11 months

git:tma0/iptrtpproxy-ip6: Support for dash in hostname

by Tomas Mandys

Module: sip-router Branch: tma0/iptrtpproxy-ip6 Commit: 7655e9bdc9457aa3f562f9af499fe47e93731480 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7655e9b… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Mon Dec 19 13:57:57 2011 +0100 Support for dash in hostname - overriden section parser to allow less strict syntax --- modules/iptrtpproxy/iptrtpproxy.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 63e38c0..685bd2c 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -2332,6 +2332,9 @@ static cfg_option_t section_dummy_options[] = { static int parse_section_name(void* param, cfg_parser_t* st, unsigned int flags) { cfg_token_t t; int ret, fl; + str tok; + char buf[MAX_TOKEN_LEN]; + ret = safe_parsed_values(); if (ret != 0) return ret; @@ -2354,8 +2357,31 @@ static int parse_section_name(void* param, cfg_parser_t* st, unsigned int flags) if (ret != 0) return ret; if (t.type != ':') goto skip; - ret = cfg_parse_section(&parse_config_vals.name, st, CFG_STR_PKGMEM); - if (ret != 0) return ret; + + /* we need override cfg_parse_section() because of possible dash '-' in section name */ + tok.s = buf; + tok.len = 0; + while (1) { + ret = cfg_get_token(&t, st, 0); + if (ret != 0) return ret; + if (t.type == ']') + break; + if (tok.len+t.val.len >= sizeof(buf)-1) goto skip; + memcpy(tok.s+tok.len, t.val.s, t.val.len); + tok.len += t.val.len; + + } + tok.s[tok.len] = '\0'; + + ret = cfg_eat_eol(st, 0); + if (ret != 0) { + return ret; + } + + parse_config_vals.name.s = pkg_malloc(tok.len+1); + if (!parse_config_vals.name.s) return -1; + memcpy(parse_config_vals.name.s, tok.s, tok.len+1); + parse_config_vals.name.len = tok.len; if (fl==iptrtpproxy_default) { if (parse_config_vals.name.len == (sizeof(SWITCHBOARD_PREFIX)-1) && strncmp(parse_config_vals.name.s, SWITCHBOARD_PREFIX, parse_config_vals.name.len) == 0) {

12 years, 11 months

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011