sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:kamailio_3.0: throw error if parameters to module functions are int

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: eb687b701730b48dffbd49a99103c64c0c3294da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb687b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 13:22:27 2009 +0100 throw error if parameters to module functions are int --- cfg.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 585edf5..9b4c0d1 100644 --- a/cfg.y +++ b/cfg.y @@ -3087,7 +3087,8 @@ func_params: | func_params error { yyerror("call params error\n"); } ; func_param: - intno { + intno { +#if 0 if (mod_func_action->val[1].u.number < MAX_ACTIONS-2) { mod_func_action->val[mod_func_action->val[1].u.number+2].type = NUMBER_ST; @@ -3097,6 +3098,9 @@ func_param: } else { yyerror("Too many arguments\n"); } +#else + yyerror("Function parameter with integer value not allowed\n"); +#endif } | STRING { if (mod_func_action->val[1].u.number < MAX_ACTIONS-2) {

15 years, 2 months

git:kamailio_3.0: pv: new pv class $xavp(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a8270008de45ef732f9ae57a86984845d0589fd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a827000… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 12:54:17 2009 +0100 pv: new pv class $xavp(...) - import from branch daniel/xavp - access XAVPs from the config via psuedo-variables --- modules_k/pv/pv.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 46c25a6..700267e 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -36,7 +36,9 @@ #include "pv_time.h" #include "pv_trans.h" #include "pv_select.h" - +#ifdef WITH_XAVP +#include "pv_xavp.h" +#endif MODULE_VERSION @@ -70,6 +72,11 @@ static pv_export_t mod_pvs[] = { pv_parse_select_name, 0, 0, 0 }, {{"snd", (sizeof("snd")-1)}, PVT_OTHER, pv_get_snd, 0, pv_parse_snd_name, 0, 0, 0}, +#ifdef WITH_XAVP + { {"xavp", sizeof("xavp")-1}, /* xavp */ + PVT_OTHER, pv_get_xavp, pv_set_xavp, + pv_parse_xavp_name, 0, 0, 0 }, +#endif {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, @@ -393,6 +400,10 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_unset", (cmd_function)pv_unset, 1, fixup_pvar_null, 0, ANY_ROUTE }, +#ifdef WITH_XAVP + {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, + ANY_ROUTE }, +#endif {0,0,0,0,0,0} };

15 years, 2 months

git:kamailio_3.0: tm: set/reset head of xavps on TM events

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a6ab14576e4ca562ea6a8f3b7c5a57a182eb3a64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6ab145… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 12:55:21 2009 +0100 tm: set/reset head of xavps on TM events - import from branch daniel/xavp --- modules/tm/h_table.c | 19 +++++++++++++++++++ modules/tm/h_table.h | 6 ++++++ modules/tm/t_hooks.c | 10 ++++++++++ modules/tm/t_reply.c | 21 +++++++++++++++++++++ modules/tm/uac.c | 3 +++ 5 files changed, 59 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index f35d7d5..f856ef6 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -210,6 +210,10 @@ void free_cell( struct cell* dead_cell ) destroy_avp_list_unsafe( &dead_cell->uri_avps_from ); if (dead_cell->uri_avps_to) destroy_avp_list_unsafe( &dead_cell->uri_avps_to ); +#ifdef WITH_XAVP + if (dead_cell->xavps_list) + xavp_destroy_list_unsafe( &dead_cell->xavps_list ); +#endif /* the cell's body */ shm_free_unsafe( dead_cell ); @@ -276,6 +280,9 @@ struct cell* build_cell( struct sip_msg* p_msg ) int sip_msg_len; avp_list_t* old; struct tm_callback *cbs, *cbs_tmp; +#ifdef WITH_XAVP + sr_xavp_t** xold; +#endif /* allocs a new cell */ /* if syn_branch==0 add space for md5 (MD5_LEN -sizeof(struct cell.md5)) */ @@ -315,6 +322,12 @@ struct cell* build_cell( struct sip_msg* p_msg ) new_cell->user_avps_to = *old; *old = 0; +#ifdef WITH_XAVP + xold = xavp_set_list(&new_cell->xavps_list ); + new_cell->xavps_list = *xold; + *xold = 0; +#endif + /* We can just store pointer to domain avps in the transaction context, * because they are read-only */ @@ -375,9 +388,15 @@ error: destroy_avp_list(&new_cell->user_avps_to); destroy_avp_list(&new_cell->uri_avps_from); destroy_avp_list(&new_cell->uri_avps_to); +#ifdef WITH_XAVP + xavp_destroy_list(&new_cell->xavps_list); +#endif shm_free(new_cell); /* unlink transaction AVP list and link back the global AVP list (bogdan)*/ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif return NULL; } diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 90abd64..739c30c 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -69,6 +69,9 @@ #include "../../types.h" #include "../../md5utils.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../xavp.h" +#endif #include "../../timer.h" #include "../../flags.h" #include "../../atomic_ops.h" @@ -360,6 +363,9 @@ typedef struct cell struct usr_avp *user_avps_to; struct usr_avp *domain_avps_from; struct usr_avp *domain_avps_to; +#ifdef WITH_XAVP + sr_xavp_t *xavps_list; +#endif /* protection against concurrent reply processing */ ser_lock_t reply_mutex; diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 6e149ea..ceb3c24 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -230,6 +230,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, { struct tm_callback *cbp; avp_list_t* backup_from, *backup_to, *backup_dom_from, *backup_dom_to, *backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif backup_uri_from = set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, &trans->uri_avps_from ); @@ -243,6 +246,10 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, &trans->domain_avps_from); backup_dom_to = set_avp_list(AVP_CLASS_DOMAIN | AVP_TRACK_TO, &trans->domain_avps_to); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&trans->xavps_list); +#endif + cbp=(struct tm_callback*)cb_lst->first; while(cbp){ membar_depends(); /* make sure the cache has the correct cbp @@ -261,6 +268,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, set_avp_list(AVP_CLASS_USER | AVP_TRACK_FROM, backup_from ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_TO, backup_uri_to ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, backup_uri_from ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index d643245..a250f63 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -114,6 +114,9 @@ #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../xavp.h" +#endif #include "../../atomic_ops.h" /* membar_write() */ #include "../../compiler_opt.h" #ifdef USE_DST_BLACKLIST @@ -688,6 +691,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) static avp_list_t* backup_user_from, *backup_user_to; static avp_list_t* backup_domain_from, *backup_domain_to; static avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + static sr_xavp_t **backup_xavps; +#endif static struct socket_info* backup_si; if (msg) { @@ -718,6 +724,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif /* set default send address to the saved value */ backup_si=bind_address; bind_address=t->uac[0].request.dst.send_sock; @@ -733,6 +742,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif bind_address=backup_si; } } @@ -1834,6 +1846,9 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1981,6 +1996,9 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif setbflagsval(0, uac->branch_flags); /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) @@ -2000,6 +2018,9 @@ int reply_received( struct sip_msg *p_msg ) set_avp_list( AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to ); set_avp_list( AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from ); set_avp_list( AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 7565763..d311cc9 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -409,6 +409,9 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* better reset avp list now - anyhow, it's useless from * this point (bogdan) */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif new_cell->method.s = buf; new_cell->method.len = uac_r->method->len;

15 years, 2 months

git:kamailio_3.0: core: introducing xavp (eXtended AVP)

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 0cb4c9f4bb5399fe9b9c946a3f69c1c595ad832b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cb4c9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 12:56:25 2009 +0100 core: introducing xavp (eXtended AVP) - import from branch daniel/xavp - design: - one master list stored in core - internal integer id to optimise the search in list (hash value over the string name) - name stored as str and null terminated (can use regexp over it) - string values stored as str and null terminated - other types of value that can be used internally (not in config) - long - long long - time - xavp (or list of xavp) - generic data structure - for more see: http://sip-router.org/wiki/devel/xavp - NOTE: this is not a replacement for existing AVPs, but an add-on, a new pseudo-variable class --- xavp.c | 508 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xavp.h | 95 ++++++++++++ 2 files changed, 603 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0cb…

15 years, 2 months

git:kamailio_3.0: core: destroy xavp list once sip msg processing is done

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: bca7a6509981defde01b6df6e63e3b483062a840 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bca7a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 12:53:14 2009 +0100 core: destroy xavp list once sip msg processing is done - import from branch daniel/xavp --- receive.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index 6ff60ee..c0312be 100644 --- a/receive.c +++ b/receive.c @@ -59,6 +59,9 @@ #include "nonsip_hooks.h" #include "dset.h" #include "usr_avp.h" +#ifdef WITH_XAVP +#include "xavp.h" +#endif #include "select_buf.h" #include "tcp_server.h" /* for tcpconn_add_alias */ @@ -271,6 +274,9 @@ end: #endif /* free possible loaded avps -bogdan */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif DBG("receive_msg: cleaning up\n"); free_sip_msg(msg); pkg_free(msg); @@ -283,6 +289,9 @@ error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif goto error02; #endif error_req: @@ -292,6 +301,9 @@ error_req: error03: /* free possible loaded avps -bogdan */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif error02: free_sip_msg(msg); pkg_free(msg);

15 years, 2 months

git:sr_3.0: fix typo in location flags settings

by Daniel-Constantin Mierla

Module: sip-router Branch: sr_3.0 Commit: 5d817af9e4ffe674187cc757a4d5a81c9450308e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d817af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:47:52 2009 +0100 fix typo in location flags settings - cflags must be used when saving branch flags (cherry picked from commit 7a967915ce71ab4e8b6577b4ed48e2a93ae6e96f) --- modules_k/registrar/save.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 470fbe4..65b09ca 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -280,7 +280,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, /* set flags */ ci.flags = _f; - getbflagsval(0, &ci.flags); + getbflagsval(0, &ci.cflags); /* get received */ if (path_received.len && path_received.s) {

15 years, 2 months

git:kamailio_3.0: fix typo in location flags settings

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 7a967915ce71ab4e8b6577b4ed48e2a93ae6e96f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a96791… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:47:52 2009 +0100 fix typo in location flags settings - cflags must be used when saving branch flags --- modules_k/registrar/save.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 470fbe4..65b09ca 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -280,7 +280,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, /* set flags */ ci.flags = _f; - getbflagsval(0, &ci.flags); + getbflagsval(0, &ci.cflags); /* get received */ if (path_received.len && path_received.s) {

15 years, 2 months

git:kamailio_3.0: set branch flags before saving location

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 2a67b2533742f7e969d17b027ca7dfea77701415 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a67b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:21:45 2009 +0100 set branch flags before saving location - enclose parameters in double-quotes --- etc/kamailio.cfg | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 29436ff..609c9fb 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -353,6 +353,11 @@ route{ if (is_method("REGISTER")) { + if(isflagset(5)) + { + setbflag("6"); + # setbflag("7"); + } if (!save("location")) sl_reply_error(); @@ -390,9 +395,9 @@ route{ route[RELAY] { #n# if (check_route_param("nat=yes")) { -#n# setbflag(6); +#n# setbflag("6"); #n# } -#n# if (isflagset(5) || isbflagset(6)) { +#n# if (isflagset(5) || isbflagset("6")) { #n# route(RTPPROXY); #n# } @@ -522,10 +527,10 @@ branch_route[BRANCH_ONE] { onreply_route[REPLY_ONE] { xdbg("incoming reply\n"); -#n# if ((isflagset(5) || isbflagset(6)) && status=~"(183)|(2[0-9][0-9])") { +#n# if ((isflagset(5) || isbflagset("6")) && status=~"(183)|(2[0-9][0-9])") { #n# force_rtp_proxy(); #n# } -#n# if (isbflagset(6)) { +#n# if (isbflagset("6")) { #n# fix_nated_contact(); #n# } } @@ -533,7 +538,7 @@ onreply_route[REPLY_ONE] { failure_route[FAIL_ONE] { #n# if (is_method("INVITE") -#n# && (isbflagset(6) || isflagset(5))) { +#n# && (isbflagset("6") || isflagset(5))) { #n# unforce_rtp_proxy(); #n# }

15 years, 2 months

git:kamailio_3.0: set default debug level to 2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 762ab0f1ce81dedaab3cc8ad20103317f06da75d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=762ab0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:46:44 2009 +0100 set default debug level to 2 - load sl after tm so it can do stateful reply via send_reply() --- etc/kamailio.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 609c9fb..b018f1a 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -57,7 +57,7 @@ ####### Global Parameters ######### -debug=3 +debug=2 memdbg=5 memlog=5 log_stderror=no @@ -114,9 +114,9 @@ mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" #m#loadmodule "db_mysql.so" loadmodule "mi_fifo.so" loadmodule "kex.so" -loadmodule "sl.so" loadmodule "tm.so" loadmodule "tmx.so" +loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so"

15 years, 2 months

git:kamailio_3.0: support for defines

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 744813329639b323e77a148aebb83112ec1039d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7448133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:05:28 2009 +0100 support for defines - applied patch from Bogdan Harjoc - support for define/ifdef/ifndef - nicer way to build config file - additions to preprocessor directives, so far was 'include' - format is: #!define ID #!ifdef ID #!ifndef ID #!else #!endif --- cfg.lex | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 105df4b..38bc6db 100644 --- a/cfg.lex +++ b/cfg.lex @@ -106,6 +106,12 @@ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ #define PVARID_S 8 /* $foo.bar...*/ #define STR_BETWEEN_S 9 + #define LINECOMMENT_S 10 + #define DEFINE_S 11 + #define DEFINE_EOL_S 12 + #define IFDEF_S 13 + #define IFDEF_EOL_S 14 + #define IFDEF_SKIP_S 15 #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -153,11 +159,19 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; + static int pp_define(int len, const char * text); + static int pp_ifdef_type(int pos); + static void pp_ifdef_var(int len, const char * text); + static void pp_ifdef(); + static void pp_else(); + static void pp_endif(); + %} /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P %x PVARID INCLF +%x LINECOMMENT DEFINE_ID DEFINE_EOL IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ SER_CFG SER @@ -475,8 +489,9 @@ TLSv1 "tlsv1"|"TLSv1"|"TLSV1" LETTER [a-zA-Z] DIGIT [0-9] -ALPHANUM {LETTER}|{DIGIT}|[_] -ID {LETTER}{ALPHANUM}* +LETTER_ {LETTER}|[_] +ALPHANUM {LETTER_}|{DIGIT} +ID {LETTER_}{ALPHANUM}* NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ @@ -507,6 +522,12 @@ COM_LINE # COM_START "/\*" COM_END "\*/" +DEFINE define +IFDEF ifdef +IFNDEF ifndef +ENDIF endif +/* else is already defined */ + EAT_ABLE [\ \t\b\r] %% @@ -1123,7 +1144,38 @@ EAT_ABLE [\ \t\b\r] sr_cfg_compat=SR_COMPAT_KAMAILIO;} <INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_MAX;} -<INITIAL>{COM_LINE}.*{CR} { count(); } + +<INITIAL>{COM_LINE}!{DEFINE}{EAT_ABLE}+ { count(); + state = DEFINE_S; BEGIN(DEFINE_ID); } +<DEFINE_ID>{ID} { count(); + if (pp_define(yyleng, yytext)) return 1; + state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); } +<DEFINE_EOL>{EAT_ABLE}*{CR} { count(); + state = INITIAL; BEGIN(INITIAL); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(1)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFNDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(0)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<IFDEF_ID>{ID} { count(); + pp_ifdef_var(yyleng, yytext); + state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); } +<IFDEF_EOL>{EAT_ABLE}*{CR} { count(); pp_ifdef(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ELSE}{EAT_ABLE}*{CR} { count(); pp_else(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ENDIF}{EAT_ABLE}*{CR} { count(); + pp_endif(); } + + /* we're in an ifdef that evaluated to false -- throw it away */ +<IFDEF_SKIP>.|{CR} { count(); } + + /* this is split so the shebangs match more, giving them priority */ +<INITIAL>{COM_LINE} { count(); state = LINECOMMENT_S; + BEGIN(LINECOMMENT); } +<LINECOMMENT>.*{CR} { count(); state = INITIAL_S; BEGIN(INITIAL); } <INITIAL>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; @@ -1474,3 +1526,102 @@ static int sr_pop_yy_state() return 0; } +/* define/ifdef support */ + +#define MAX_DEFINES 1024 +static str pp_defines[MAX_DEFINES]; +static int pp_num_defines = 0; + +/* pp_ifdef_stack[i] is 1 if the ifdef test at depth i is either + * ifdef(defined), ifndef(undefined), or the opposite of these + * two, but in an else branch + */ +#define MAX_IFDEFS 128 +static int pp_ifdef_stack[MAX_IFDEFS]; +static int pp_sptr = 0; /* stack pointer */ + +static int pp_lookup(int len, const char * text) +{ + str var = {(char *)text, len}; + int i; + + for (i=0; i<pp_num_defines; i++) + if (STR_EQ(pp_defines[i], var)) + return i; + + return -1; +} + +static int pp_define(int len, const char * text) +{ + if (pp_num_defines == MAX_DEFINES) { + LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); + return -1; + } + + if (pp_lookup(len, text) >= 0) { + LOG(L_CRIT, "ERROR: already defined: %.*s\n", len, text); + return -1; + } + + pp_defines[pp_num_defines].len = len; + pp_defines[pp_num_defines].s = (char*)pkg_malloc(len+1); + memcpy(pp_defines[pp_num_defines].s, text, len); + pp_num_defines++; + + return 0; +} + +static int pp_ifdef_type(int type) +{ + if (pp_sptr == MAX_IFDEFS) { + LOG(L_CRIT, "ERROR: too many nested ifdefs -- adjust MAX_IFDEFS\n"); + return -1; + } + + pp_ifdef_stack[pp_sptr] = type; + return 0; +} + +/* this sets the result of the if[n]def expr: + * ifdef defined -> 1 + * ifdef undefined -> 0 + * ifndef defined -> 0 + * ifndef undefined -> 1 + */ +static void pp_ifdef_var(int len, const char * text) +{ + pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); +} + +static void pp_update_state() +{ + int i; + + for (i=0; i<pp_sptr; i++) + if (! pp_ifdef_stack[i]) { + state = IFDEF_SKIP_S; BEGIN(IFDEF_SKIP); + return; + } + + state = INITIAL; BEGIN(INITIAL); +} + +static void pp_ifdef() +{ + pp_sptr++; + pp_update_state(); +} + +static void pp_else() +{ + pp_ifdef_stack[pp_sptr-1] ^= 1; + pp_update_state(); +} + +static void pp_endif() +{ + pp_sptr--; + pp_update_state(); +} +

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev