sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

git:master: core: parse_phostport split for k compatibility

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: df088fb86adaf8f10bbdfebd5502ea9590341bc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df088fb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 13:00:37 2009 +0200 core: parse_phostport split for k compatibility parse_phostport in sr and ser returned a list of pkg_malloc'ed addresses belonging to the same multi-homed "group". For example sctp:(1.2.3.4, 5.6.7.8):5080 is a valid address and it means that this sctp listening socket must use multi-homing on the 2 IPs. However several kamailio modules use parse_phostport and expect the old integer returning version. In this case it was easier to split the function in the core into parse_phostport() (old behaviour) and parse_phostport_mh() (returns list of MH addresses) and make the core command line parser use the MH supporting version. --- main.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- socket_info.h | 2 +- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index 8d7bc57..23455e7 100644 --- a/main.c +++ b/main.c @@ -963,7 +963,21 @@ error: * returns fills proto, port, host and returns list of addresses on success * (pkg malloc'ed) and 0 on failure */ -struct name_lst* parse_phostport(char* s, char** host, int* hlen, +/** get protocol host and port from a string representation. + * parses [proto:]host[:port] or + * [proto:](host_1, host_2, ... host_n)[:port] + * where proto= udp|tcp|tls|sctp + * @param s - string (like above) + * @param host - will be filled with the host part + * Note: for multi-homing it wil contain all the addresses + * (e.g.: "sctp:(1.2.3.4, 5.6.7.8)" => host="(1.2.3.4, 5.6.7.8)") + * @param hlen - will be filled with the length of the host part. + * @param port - will be filled with the port if present or 0 if it's not. + * @param proto - will be filled with the protocol if present or PROTO_NONE + * if it's not. + * @return fills proto, port, host and returns 0 on success and -1 on failure. + */ +int parse_phostport(char* s, char** host, int* hlen, int* port, int* proto) { char* first; /* first ':' occurrence */ @@ -997,7 +1011,7 @@ struct name_lst* parse_phostport(char* s, char** host, int* hlen, break; } } - if (p==s) return 0; + if (p==s) return -1; if (*(p-1)==':') goto error_colons; if (first==0){ /* no ':' => only host */ @@ -1030,22 +1044,48 @@ struct name_lst* parse_phostport(char* s, char** host, int* hlen, *hlen=(int)(first-*host); } end: - return parse_name_lst(*host, *hlen); + return 0; error_brackets: LOG(L_ERR, "ERROR: parse_phostport: too many brackets in %s\n", s); - return 0; + return -1; error_colons: LOG(L_ERR, "ERROR: parse_phostport: too many colons in %s\n", s); - return 0; + return -1; error_proto: LOG(L_ERR, "ERROR: parse_phostport: bad protocol in %s\n", s); - return 0; + return -1; error_port: LOG(L_ERR, "ERROR: parse_phostport: bad port number in %s\n", s); + return -1; +} + + + +/** get protocol host, port and MH addresses list from a string representation. + * parses [proto:]host[:port] or + * [proto:](host_1, host_2, ... host_n)[:port] + * where proto= udp|tcp|tls|sctp + * @param s - string (like above) + * @param host - will be filled with the host part + * Note: for multi-homing it wil contain all the addresses + * (e.g.: "sctp:(1.2.3.4, 5.6.7.8)" => host="(1.2.3.4, 5.6.7.8)") + * @param hlen - will be filled with the length of the host part. + * @param port - will be filled with the port if present or 0 if it's not. + * @param proto - will be filled with the protocol if present or PROTO_NONE + * if it's not. + * @return fills proto, port, host and returns list of addresses on success + * (pkg malloc'ed) and 0 on failure + */ +static struct name_lst* parse_phostport_mh(char* s, char** host, int* hlen, + int* port, int* proto) +{ + if (parse_phostport(s, host, hlen, port, proto)==0) + return parse_name_lst(*host, *hlen); return 0; } + /** Update \c cfg_file variable to contain full pathname. The function updates * the value of \c cfg_file global variable to contain full absolute pathname * to the main configuration file of SER. The function uses CFG_FILE macro to @@ -1712,7 +1752,7 @@ try_again: } break; case 'l': - if ((n_lst=parse_phostport(optarg, &tmp, &tmp_len, + if ((n_lst=parse_phostport_mh(optarg, &tmp, &tmp_len, &port, &proto))==0){ fprintf(stderr, "bad -l address specifier: %s\n", optarg); diff --git a/socket_info.h b/socket_info.h index 4179869..6da9437 100644 --- a/socket_info.h +++ b/socket_info.h @@ -97,7 +97,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, struct socket_info** get_sock_info_list(unsigned short proto); -struct name_lst* parse_phostport(char* s, char** host, int* hlen, +int parse_phostport(char* s, char** host, int* hlen, int* port, int* proto); /* helper function:

15 years, 5 months

git:master: tmx(k): missing type for mi_tm_uac_dlg callback

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: beb71da826ed6e8b533bb1c62b7e5ff179ed5e6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=beb71da… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 10:21:36 2009 +0200 tmx(k): missing type for mi_tm_uac_dlg callback sr tm t_uac() does not automatically register any transaction callback (unlike old ser or kamailio versions). If a callback is desired, besides the callback pointer, the callback type mask must also be specified (in this case TMCB_LOCAL_COMPLETED). --- modules_k/tmx/t_mi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 4c73a54..e2fa5b4 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -623,6 +623,7 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) { uac_r.cb = mi_uac_dlg_hdl; uac_r.cbp = (void*)cmd_tree->async_hdl; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; } n = _tmx_tmb.t_uac(&uac_r);

15 years, 5 months

git:master: tm: AS - fixed onsend callbacks invocation

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 311d365b18fca29379e57e02855fd71b325fb7eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=311d365… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 10:13:47 2009 +0200 tm: AS - fixed onsend callbacks invocation When compiled with WITH_AS_SUPPORT and TMCB_ONSEND, ack_local_uac() used a wrong way for calling the onsend callbacks (compile error). --- modules/tm/uac.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 6dfd0fc..f3b32b8 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -492,6 +492,9 @@ int ack_local_uac(struct cell *trans, str *hdrs, str *body) { struct retr_buf *local_ack, *old_lack; int ret; +#ifdef TMCB_ONSEND + struct tmcb_params onsend_params; +#endif /* sanity checks */ @@ -553,9 +556,11 @@ int ack_local_uac(struct cell *trans, str *hdrs, str *body) } #ifdef TMCB_ONSEND else { - run_onsend_callbacks2(TMCB_REQUEST_SENT, &trans->uac[0]->request, - local_ack->buffer, local_ack->buffer_len, &local_ack->dst, - TYPE_LOCAL_ACK); + INIT_TMCB_ONSEND_PARAMS(onsend_params, 0, 0, &trans->uac[0].request, + &local_ack->dst, + local_ack->buffer, local_ack->buffer_len, + TMCB_LOCAL_F, 0 /* branch */, TYPE_LOCAL_ACK); + run_onsend_callbacks2(TMCB_REQUEST_SENT, trans, &onsend_params); } #endif

15 years, 5 months

git:master: tm: AS added needed membar

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f0ab0db3b66fcc7912065ee960aff71615e9ce3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0ab0db… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 10:16:10 2009 +0200 tm: AS added needed membar When compiled with -DWITH_AS_SUPPORT build_local_ack() needed a membar_write_atomic_op() before setting the new local ack retr. buf pointer (this will force the local_ack content to be fully written before replacing the pointer and it's need on some non-x86 archs.). --- modules/tm/t_reply.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index ba06cd1..ea5db73 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -414,6 +414,10 @@ static char *build_local_ack(struct sip_msg* rpl, struct cell *trans, } /* set the new buffer, but only if not already set (concurrent 2xx) */ + /* a memory write barrier is needed to make sure the local_ack + content is fully written, before we try to add it to the transaction + -- andrei */ + membar_write_atomic_op(); if ((old_lack = (struct retr_buf *)atomic_cmpxchg_long( (void *)&trans->uac[0].local_ack, 0, (long)local_ack))) { /* buffer already set: trash current and use the winning one */

15 years, 5 months

git:master: dispatcher(k): safety checks for duri

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1ff6c9a7fbbc9369d0d240587b21857a4888c47a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ff6c9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 19 17:37:22 2009 +0200 dispatcher(k): safety checks for duri - due to usage of SR append_branch() instead of km_append_branch(), duri has to be checked before giving inner fields as parameters --- modules_k/dispatcher/dispatch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index b26c2f8..ff260f9 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1061,7 +1061,8 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) } if(ds_append_branch!=0 && route_type==FAILURE_ROUTE) { - if (append_branch(msg, 0, 0, duri->s, duri->len, Q_UNSPECIFIED, 0)!=1 ) + if (append_branch(msg, 0, 0, (duri)?duri->s:0, (duri)?duri->len:0, + Q_UNSPECIFIED, 0)!=1 ) { LM_ERR("append_branch action failed\n"); return -1;

15 years, 5 months

crash with dialog module

by jh＠tutpro.com

i have never used k dialog module because it is by far the buggies module that k has. now i ventured to try and, by no surprise, i crashed sr before a single message went through. looks like it started to play with db although i had not defined any. -- juha (gdb) where #0 0x00000000 in ?? () #1 0xb728bba4 in dlg_connect_db (db_url=0xb72ab574) at dlg_db_handler.c:119 #2 0xb72885e8 in child_init (rank=2) at dialog.c:576 #3 0x080e0f1b in init_mod_child (m=0x8231b20, rank=2) at sr_module.c:808 #4 0x080e0e90 in init_mod_child (m=0x8231d10, rank=2) at sr_module.c:785 #5 0x080e0e90 in init_mod_child (m=0x8231e20, rank=2) at sr_module.c:785 #6 0x080e0e90 in init_mod_child (m=0x8231ef8, rank=2) at sr_module.c:785 #7 0x080e0e90 in init_mod_child (m=0x82320e8, rank=2) at sr_module.c:785 #8 0x080e0e90 in init_mod_child (m=0x8232248, rank=2) at sr_module.c:785 #9 0x080e0e90 in init_mod_child (m=0x8232450, rank=2) at sr_module.c:785 #10 0x080e0e90 in init_mod_child (m=0x8232a70, rank=2) at sr_module.c:785 #11 0x080e0e90 in init_mod_child (m=0x8232c18, rank=2) at sr_module.c:785 #12 0x080a0b75 in fork_process (child_id=2, desc=0xbfd5db7c "udp receiver child=1 sock=192.98.101.10:5060", make_sock=1) at pt.c:329 #13 0x08088119 in main_loop () at main.c:1307 #14 0x0808ae4f in main (argc=-2082109099, argv=0x7d8928ec) at main.c:2108

15 years, 5 months

git:master: dialog(k): fixed db initialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fd5621f188d23d89bc4e475e3bc1e7964a065a90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd5621f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 19 17:19:25 2009 +0200 dialog(k): fixed db initialization - child init DB initialization condition properly tests the db mode - reported by Juha Heinanen --- modules_k/dialog/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 657f859..8f26aca 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -570,7 +570,7 @@ static int child_init(int rank) if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); } - if ( ((dlg_db_mode==DB_MODE_REALTIME || DB_MODE_DELAYED) && + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { if ( dlg_connect_db(&db_url) ) {

15 years, 5 months

w: timer runs faster

by Daniel-Constantin Mierla

I see pretty many warnings of this type: 4(22966) WARNING: <core> [timer.c:448]: WARNING: our timer runs faster then real-time (1570000 ms / 25120 ticks our time .-> 1569937 ms / 25118 ticks real time) 4(22966) WARNING: <core> [timer.c:448]: WARNING: our timer runs faster then real-time (1005000 ms / 16080 ticks our time .-> 1002398 ms / 16038 ticks real time) is it something to ignore? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/index.php/sip-router-bootcamp/

15 years, 5 months

git:master: makefile: don't install tls certs & cfg by default

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 3390d4cf787b58f440ecd46dcb05910b060f8dc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3390d4c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jul 18 11:24:19 2009 +0200 makefile: don't install tls certs & cfg by default Install tls certs & cfg only if the tls module is installed (moved certs & cfg installation from the main Makefile to the tls module Makefile). --- Makefile | 4 ++-- modules/tls/Makefile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 32b8b2b..7a478c7 100644 --- a/Makefile +++ b/Makefile @@ -803,8 +803,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) # TLS configuration $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg - $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) - modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + #$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) + #modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 30dacf4..213a484 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -16,6 +16,15 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" +$(cfg_prefix)/$(cfg_dir): + mkdir -p $(cfg_prefix)/$(cfg_dir) + +install-cfg: $(cfg_prefix)/$(cfg_dir) + $(INSTALL_CFG) tls.cfg $(cfg_prefix)/$(cfg_dir) + ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + +install: install-cfg + DEFS+=-DOPENSER_MOD_INTERFACE

15 years, 5 months

git:master: core: script engine cleanups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: aa9fa735a88363d9a452a4b84dcd25b516d731cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa9fa73… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jul 18 11:05:05 2009 +0200 core: script engine cleanups Use named enums for action types, expression types, expressions left operands, expression right operands and action parameter types. This should avoid future type mismatching bugs (like trying to compare a left expr. operand type with a type that can exist only on the right part) by triggering compile time warnings. For extra protection the expression left operands and right operands possible value do not overlap anymore. --- action.c | 3 ++- route.c | 8 ++++++-- route_struct.c | 13 +++++++++++-- route_struct.h | 53 ++++++++++++++++++++++++++++++++++++++--------------- 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/action.c b/action.c index a793263..848ec59 100644 --- a/action.c +++ b/action.c @@ -1202,9 +1202,10 @@ match_cleanup: else ret=v; break; - +/* default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); +*/ } skip: return ret; diff --git a/route.c b/route.c index 7c01a3b..fc25c64 100644 --- a/route.c +++ b/route.c @@ -623,6 +623,7 @@ int fix_actions(struct action* a) struct proxy_l* p; char *tmp; int ret; + int i; union cmd_export_u* cmd; str s; struct hostent* he; @@ -886,7 +887,6 @@ int fix_actions(struct action* a) case MODULEX_T: cmd = t->val[0].u.data; if (cmd && cmd->c.fixup) { - int i; DBG("fixing %s()\n", cmd->c.name); if (t->val[1].u.number==0) { ret = cmd->c.fixup(0, 0); @@ -976,6 +976,9 @@ int fix_actions(struct action* a) (unsigned int)t->val[0].u.number); } break; + default: + /* no fixup required for the rest */ + break; } } return 0; @@ -1699,10 +1702,11 @@ inline static int eval_elem(struct run_act_ctx* h, struct expr* e, case PVAR_O: ret=comp_pvar(e->op, e->l.param, e->r_type, &e->r, msg, h); break; - +/* default: LOG(L_CRIT, "BUG: eval_elem: invalid operand %d\n", e->l_type); +*/ } return ret; error: diff --git a/route_struct.c b/route_struct.c index 7fce4b8..9f4d6b2 100644 --- a/route_struct.c +++ b/route_struct.c @@ -113,7 +113,8 @@ error: return 0; } -struct expr* mk_elem(int op, int ltype, void* lparam, int rtype, void* rparam) +struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, + expr_r_type rtype, void* rparam) { struct expr * e; e=(struct expr*)pkg_malloc(sizeof (struct expr)); @@ -131,7 +132,15 @@ error: } -struct action* mk_action(int type, int count/* of couples {type,val} */, .../* int type1, void *val1 [, int type2, void *val2, ...] */) { +/** create an action structure (parser use). + * @param type - type of the action + * @param count - count of couples {param_type,val} + * @param ... - count {param_type, val} pairs, where param_type is + * action_param_type. + * @return new action structure on success (pkg_malloc'ed) or 0 on error. + */ +struct action* mk_action(enum action_type type, int count, ...) +{ va_list args; int i; struct action* a; diff --git a/route_struct.h b/route_struct.h index 340cbf6..090388c 100644 --- a/route_struct.h +++ b/route_struct.h @@ -60,15 +60,26 @@ */ -enum { EXP_T=1, ELEM_T }; -enum { LOGAND_OP=1, LOGOR_OP, NOT_OP, BINAND_OP, BINOR_OP }; -enum { EQUAL_OP=10, MATCH_OP, GT_OP, LT_OP, GTE_OP, LTE_OP, DIFF_OP, NO_OP }; -enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, - DSTIP_O, DSTPORT_O, PROTO_O, AF_O, MSGLEN_O, DEFAULT_O, ACTION_O, +/* expression type */ +enum expr_type { EXP_T=1, ELEM_T }; +enum expr_op { + /* expression operator if type==EXP_T */ + LOGAND_OP=1, LOGOR_OP, NOT_OP, BINAND_OP, BINOR_OP, + /* expression operator if type==ELEM_T */ + EQUAL_OP=10, MATCH_OP, GT_OP, LT_OP, GTE_OP, LTE_OP, DIFF_OP, NO_OP +}; +/* expression left member "special" type (if type==ELEM_T) + (start at 51 for debugging purposes: it's better to not overlap with + expr_r_type) +*/ +enum _expr_l_type{ + METHOD_O=51, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, + DSTIP_O, DSTPORT_O, PROTO_O, AF_O, MSGLEN_O, ACTION_O, NUMBER_O, AVP_O, SNDIP_O, SNDPORT_O, TOIP_O, TOPORT_O, SNDPROTO_O, SNDAF_O, RETCODE_O, SELECT_O, PVAR_O, RVEXP_O}; - -enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, +/* action types */ +enum action_type{ + FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, SET_HOSTALL_T, SET_USERPHONE_T, @@ -96,7 +107,10 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, ADD_T, UDP_MTU_TRY_PROTO_T }; -enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, +/* parameter types for actions or types for expression right operands + (WARNING right operands only, not working for left operands) */ +enum _operand_subtype{ + NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, EXPR_ST, ACTIONS_ST, MODEXP_ST, MODFIXUP_ST, URIHOST_ST, URIPORT_ST, MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, SELECT_ST, PVAR_ST, @@ -105,6 +119,10 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST }; +typedef enum _expr_l_type expr_l_type; +typedef enum _operand_subtype expr_r_type; +typedef enum _operand_subtype action_param_type; + /* run flags */ #define EXIT_R_F 1 #define RETURN_R_F 2 @@ -134,15 +152,16 @@ union exp_op { }; struct expr{ - int type; /* exp, exp_elem */ - int op; /* and, or, not | ==, =~ */ - int l_type, r_type; + enum expr_type type; /* exp, exp_elem */ + enum expr_op op; /* and, or, not | ==, =~ */ + expr_l_type l_type; + expr_r_type r_type; union exp_op l; union exp_op r; }; typedef struct { - int type; + action_param_type type; union { long number; char* string; @@ -160,16 +179,20 @@ typedef struct { #define MAX_ACTIONS (2+6) struct action{ - int type; /* forward, drop, log, send ...*/ + enum action_type type; /* forward, drop, log, send ...*/ int count; struct action* next; action_u_t val[MAX_ACTIONS]; }; struct expr* mk_exp(int op, struct expr* left, struct expr* right); -struct expr* mk_elem(int op, int ltype, void* lparam, int rtype, void* rparam); +struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, + expr_r_type rtype, void* rparam); + +/* @param type - type of the action + @param count - count of couples {type,val} (variable number of parameters)*/ +struct action* mk_action(enum action_type type, int count, ...); -struct action* mk_action(int type, int count/* of couples {type,val} */, .../* int type1, void *val1 [, int type2, void *val2, ...] */); struct action* append_action(struct action* a, struct action* b); void print_action(struct action* a);

15 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev