sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:sr_3.0: tm: onreply_route executed under lock to protect the avps

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: b577291770fbae2d9df294529dd852acd760c4d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b577291… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 10 18:35:17 2009 +0100 tm: onreply_route executed under lock to protect the avps Quick fix for the onreply_route possible avp corruption: execute the onreply route under lock. --- modules/tm/t_reply.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 28e635e..8dbd1d6 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -89,7 +89,9 @@ * 2008-03-12 use cancel_b_method on 6xx (andrei) * 2008-05-30 make sure the wait timer is started after we don't need t * anymore to allow safe calls from fr_timer (andrei) - * 2009-06-01 Pre- and post-script callbacks of branch route are executed (Miklos) + * 2009-06-01 Pre- and post-script callbacks of branch route are + * executed (Miklos) + * 2009-12-10 reply route is executed under lock to protect the avps (andrei) * */ @@ -1834,6 +1836,7 @@ 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; + int replies_locked; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1860,6 +1863,7 @@ int reply_received( struct sip_msg *p_msg ) tm_ctx_set_branch_index(branch); cancel_bitmap=0; msg_status=p_msg->REPLY_STATUS; + replies_locked=0; uac=&t->uac[branch]; DBG("DEBUG: reply_received: org. status uas=%d, " @@ -1984,6 +1988,9 @@ int reply_received( struct sip_msg *p_msg ) /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) */ + /* lock onreply_route, for safe avp usage */ + LOCK_REPLIES( t ); + replies_locked=1; if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg, 0)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ @@ -2035,15 +2042,22 @@ int reply_received( struct sip_msg *p_msg ) * reply lock is held (the lock won't be held while sending the * message)*/ if (cfg_get(core, core_cfg, use_dns_failover) && (msg_status==503)) { - branch_ret=add_uac_dns_fallback(t, t->uas.request, uac, 1); + branch_ret=add_uac_dns_fallback(t, t->uas.request, + uac, !replies_locked); prev_branch=-1; + /* unlock replies to avoid sending() while holding a lock */ + if (unlikely(replies_locked)) { + UNLOCK_REPLIES( t ); + replies_locked = 0; + } while((branch_ret>=0) &&(branch_ret!=prev_branch)){ prev_branch=branch_ret; branch_ret=t_send_branch(t, branch_ret, t->uas.request , 0, 1); } } #endif - LOCK_REPLIES( t ); + if (unlikely(!replies_locked)) + LOCK_REPLIES( t ); if ( is_local(t) ) { reply_status=local_reply( t, p_msg, branch, msg_status, &cancel_bitmap ); if (reply_status == RPS_COMPLETED) {

15 years, 1 month

AVPs in replies?

by Klaus Darilion

Hi! K's tm module can be configured to have transaction AVPs or message AVPs: http://kamailio.org/docs/modules/1.5.x/tm#id2530480 What is the behaviour of ser's tm module? I need AVPs in reply route - is it supported? regards klaus

15 years, 1 month

deleting tcp contacts upon restart?

by jh＠tutpro.com

when sr is restarted, would it make sense to delete all tcp contacts from location table? -- juha

15 years, 1 month

[ openser-Bugs-2911707 ] usrloc stores username in lowercase in "location" table

by SourceForge.net

Bugs item #2911707, was opened at 2009-12-10 00:11 Message generated for change (Comment added) made by henningw You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2911707&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Invalid Priority: 5 Private: No Submitted By: Asgaroth (asgaroth000) >Assigned to: Henning Westerholt (henningw) Summary: usrloc stores username in lowercase in "location" table Initial Comment: I am trying to integrate Kamailio (1.5.3-notls) into our existing database structure using a view for the subscriber table and using the location table to store the registration information. I am successfully able to register a phone using this method. One of our requirements is to set an "outboundproxy" and "outboundproxyport" parameter in the location table for a particular sip account (username). I am trying to do this with the sqlops module. What I have come across though is that when the registration information is saved to the location table the username is stored in lower case. So when my sqlops query is run against the username it does not match. For example, in the subscriber table I have view defined that for my user account returns the following information: ------------- select * from subscriber where username = 'BruceNW9440'; username | domain | password | ha1 | ha1b -------------+---------------+------------+----------------------------------+---------------------------------- BruceNW9440 | 10.10.10.10 | 00minger00 | 1f2d688f65be04a61cab36a1fb3f426a | 6529d45f5c418daf35be7b3dd4a858cb (1 row) ------------- Now, if I check the above against the location table: -------------- select * from location where username = 'BruceNW9440'; 0 rows returned -------------- If I run the same query using "brucenw9440" as the username (lowercase) then the correct information is returned. I have the following log line in my kamailio configuration script: xlog("L_INFO","Username: $au, OutboundProxy: $Ri, OutboundProxyPort: $Rp"); The details of this log appear correct when it is logged: Dec 9 14:21:03 ibis /opt/kamailio/sbin/kamailio[16972]: [ID 197553 local0.info] Username: BruceNW9440, OutboundProxy: 10.10.10.10, OutboundProxyPort: 5060 However, when my sqlopt query is run it does not find a match because of the incorrect case: sql_query("bfl", "UPDATE location SET outboundproxy = '$Ri', outboundproxyport = '$Rp' WHERE username = '$au'", "res"); I've had a read through the usrloc module documentation and I cannot seem to find a reference to any options that will preserve the case. I also cannot find if there is a parameter to save('location') that will preserve the case. I cant seem to find a reference to the save() function on the wiki. I must be missing something small. ---------------------------------------------------------------------- >Comment By: Henning Westerholt (henningw) Date: 2009-12-10 13:56 Message: I can confirm that setting the mentioned parameter fixes the usrloc insertion. >From the location table, parameter set to 0: | testaccount.33 | 2009-12-10 16:47:21 | sip:Testaccount.33@XXXXX:5060 | sipp running on XXXXX with parameter set to 1: | Testaccount.33 | 2009-12-10 16:48:10 | sip:Testaccount.33@XXXXXX:5060 | sipp running on XXXXX Therefore i think its not a bug in the module, only a configuration and database issue. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-12-10 09:03 Message: There is a parameter to control case sensitivity: http://kamailio.org/docs/modules/1.5.x/registrar.html#id2491689 ---------------------------------------------------------------------- Comment By: Henning Westerholt (henningw) Date: 2009-12-10 08:54 Message: I can confirm that usrloc stores the name in lowercase, even if its in upper case in the subscriber table. This is probably a bug. For the other thing, the reported case sensitivity in the query against the location table, this is defined from the database that is used. So if you would e.g. switch to mysql, all your queries would be case insensitive. So i changed the bug title to be mirror this. ---------------------------------------------------------------------- Comment By: Asgaroth (asgaroth000) Date: 2009-12-10 00:38 Message: Just for further information, here is the logic in the main route of the kamailio script that is causing the problem, I thought I would add it in so you can see where I am trying to execute the update. The actual authentication is processed prior to this section. if (is_method("REGISTER")) { if (!save("location")) { sl_reply_error(); } else { xlog("L_INFO","Username: $au, FromUser: $fu, OutboundProxy: $Ri, OutboundProxyPort: $Rp"); sql_query("bfl", "UPDATE location SET outboundproxy = '$Ri', outboundproxyport = '$Rp' WHERE username = '$au'", "res"); } exit; } ---------------------------------------------------------------------- Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-12-10 00:19 Message: According to RFC 3261 BNF grammar, the username part of a SIP URI is case sensitive, this is: sip:alice@domain.org != sip:Alice@domain.org but domain part is case insensitive so: sip:alice@domain.org == sip:alice@DOMain.ORG So if 'usrloc' forces lowcase that's not correct (IMHO). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2911707&group_…

15 years, 1 month

git:kamailio_3.0: sercmd: fix LIBS when installing from a module

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: bf31febc3f17d085dbdd78df12ac6bb01c308744 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf31feb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 4 17:39:46 2009 +0100 sercmd: fix LIBS when installing from a module Don't rely on LIBS having a valid value, since we might get called from a module Makefile. Use needed libs in function of $(OS). (cherry picked from commit b0f00c3348b9c1429f6df5b39dcbd1ca939e9dfc) --- utils/sercmd/Makefile | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 4ed85f4..fbf616d 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -24,7 +24,15 @@ endif #ifneq (,$(MAKECMDGOALS)) C_DEFS:= DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) -LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) + +# use proper libs (we can't rely on LIBS value since we might be called +# from a module Makefile) +#LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) + +LIBS:= -lresolv +ifeq ($(OS), solaris) + LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +endif ifeq ($(use_readline),) readline_path := $(shell \

15 years, 1 month

git:kamailio_3.0: modules_k/registrar: Removed tcp_persistent_flag module parameter.

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 346b6cc15caa05934a86be39b1c0867356439917 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=346b6cc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 9 10:19:54 2009 +0200 modules_k/registrar: Removed tcp_persistent_flag module parameter. - Commented out tcp_persistent_flag module parameter, because sr_3.0 tm does not support it. - Removed the flags also from module README. (cherry picked from commit 021e8d571f81ccd212004e5efee2808bb7790c96) --- modules_k/registrar/README | 230 ++++++++++++--------------- modules_k/registrar/doc/registrar_admin.xml | 25 --- modules_k/registrar/reg_mod.c | 4 +- 3 files changed, 108 insertions(+), 151 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=346…

15 years, 1 month

git:kamailio_3.0: ctl: fix #includes on solaris

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ad63bc6258113fb031c888ce31c65114e3bacfa0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad63bc6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 2 20:14:54 2009 -0500 ctl: fix #includes on solaris (cherry picked from commit 4920290b90947fa59f7e794fc92abd6796950c33) --- modules/ctl/init_socks.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ctl/init_socks.h b/modules/ctl/init_socks.h index 3eddea9..a2be3a4 100644 --- a/modules/ctl/init_socks.h +++ b/modules/ctl/init_socks.h @@ -31,6 +31,7 @@ #ifndef _init_socks_h #define _init_socks_h +#include <sys/types.h> #include <sys/un.h> #include "../../ip_addr.h"

15 years, 1 month

git:kamailio_3.0: script engine: verbose conversion-to-int errors

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9d1f0c69a0ac832c00245ec92c2ec431c1241e97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d1f0c6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 16 19:41:02 2009 +0100 script engine: verbose conversion-to-int errors - more verbose errors (all of them contain now the config file position for the error). - integer conversion errors will now by default log a warning message. Like before they won't cause the expression evaluation to fail, they'll just evaluate the failed conversion to 0. The behaviour can be changed using the defines at the top of rvalue.c. To restore the old behaviour (no int conversion error message and error ignored), comment out the following defines: RV_STR2INT_VERBOSE_ERR, RV_STRINT_ERR, EVAL_GET_INT_ERR_WARN, RVAL_GET_INT_ERR_IGN. For more info see the comments in the file. (cherry picked from commit c744f71c858f34d41741d90e0d5cb05e48cf8016) --- lvalue.c | 4 +- rvalue.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 193 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9d1…

15 years, 1 month

git:kamailio_3.0: core: pid_t warning fixes for solaris

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9fdd69e863d95757655c561cd525c42ee7570b65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fdd69e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 2 20:15:36 2009 -0500 core: pid_t warning fixes for solaris (cherry picked from commit ca351abe9bd52f24003a96ed4f9a420739728496) --- main.c | 12 ++++++------ tcp_main.c | 21 +++++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/main.c b/main.c index fc25588..fd4b642 100644 --- a/main.c +++ b/main.c @@ -713,19 +713,19 @@ void handle_sigs() case SIGCHLD: while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { if (WIFEXITED(chld_status)) - LOG(L_ALERT, "child process %d exited normally," - " status=%d\n", chld, + LOG(L_ALERT, "child process %ld exited normally," + " status=%d\n", (long)chld, WEXITSTATUS(chld_status)); else if (WIFSIGNALED(chld_status)) { - LOG(L_ALERT, "child process %d exited by a signal" - " %d\n", chld, WTERMSIG(chld_status)); + LOG(L_ALERT, "child process %ld exited by a signal" + " %d\n", (long)chld, WTERMSIG(chld_status)); #ifdef WCOREDUMP LOG(L_ALERT, "core was %sgenerated\n", WCOREDUMP(chld_status) ? "" : "not " ); #endif }else if (WIFSTOPPED(chld_status)) - LOG(L_ALERT, "child process %d stopped by a" - " signal %d\n", chld, + LOG(L_ALERT, "child process %ld stopped by a" + " signal %d\n", (long)chld, WSTOPSIG(chld_status)); } #ifndef STOP_JIRIS_CHANGES diff --git a/tcp_main.c b/tcp_main.c index 77ecdf5..4840ddc 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2810,8 +2810,9 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) if (unlikely(tcp_c->unix_sock<=0)){ /* (we can't have a fd==0, 0 is never closed )*/ LOG(L_CRIT, "BUG: handle_tcp_child: fd %d for %d " - "(pid %d, ser no %d)\n", tcp_c->unix_sock, - (int)(tcp_c-&tcp_children[0]), tcp_c->pid, tcp_c->proc_no); + "(pid %ld, ser no %d)\n", tcp_c->unix_sock, + (int)(tcp_c-&tcp_children[0]), (long)tcp_c->pid, + tcp_c->proc_no); goto error; } /* read until sizeof(response) @@ -2820,9 +2821,9 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) if (unlikely(bytes<(int)sizeof(response))){ if (bytes==0){ /* EOF -> bad, child has died */ - DBG("DBG: handle_tcp_child: dead tcp child %d (pid %d, no %d)" + DBG("DBG: handle_tcp_child: dead tcp child %d (pid %ld, no %d)" " (shutting down?)\n", (int)(tcp_c-&tcp_children[0]), - tcp_c->pid, tcp_c->proc_no ); + (long)tcp_c->pid, tcp_c->proc_no ); /* don't listen on it any more */ io_watch_del(&io_h, tcp_c->unix_sock, fd_i, 0); goto error; /* eof. so no more io here, it's ok to return error */ @@ -2831,8 +2832,8 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) * e.g.: SIGIO_RT overflow mode or EPOLL ET */ if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK)){ LOG(L_CRIT, "ERROR: handle_tcp_child: read from tcp child %ld " - " (pid %d, no %d) %s [%d]\n", - (long)(tcp_c-&tcp_children[0]), tcp_c->pid, + " (pid %ld, no %d) %s [%d]\n", + (long)(tcp_c-&tcp_children[0]), (long)tcp_c->pid, tcp_c->proc_no, strerror(errno), errno ); }else{ bytes=0; @@ -2857,8 +2858,8 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) if (unlikely(tcpconn==0)){ /* should never happen */ LOG(L_CRIT, "BUG: handle_tcp_child: null tcpconn pointer received" - " from tcp child %d (pid %d): %lx, %lx\n", - (int)(tcp_c-&tcp_children[0]), tcp_c->pid, + " from tcp child %d (pid %ld): %lx, %lx\n", + (int)(tcp_c-&tcp_children[0]), (long)tcp_c->pid, response[0], response[1]) ; goto end; } @@ -3330,9 +3331,9 @@ inline static int send2child(struct tcp_connection* tcpconn) " connection passed to the least busy one (%d)\n", min_busy); } - DBG("send2child: to tcp child %d %d(%d), %p\n", idx, + DBG("send2child: to tcp child %d %d(%ld), %p\n", idx, tcp_children[idx].proc_no, - tcp_children[idx].pid, tcpconn); + (long)tcp_children[idx].pid, tcpconn); /* first make sure this child doesn't have pending request for * tcp_main (to avoid a possible deadlock: e.g. child wants to * send a release command, but the master fills its socket buffer

15 years, 1 month

git:kamailio_3.0: parser: fix for solaris yacc compatibility

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 4f8610b879354f88e22aa58c8b66bfe06edf9d2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f8610b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 2 20:12:40 2009 -0500 parser: fix for solaris yacc compatibility %prec was used in a wrong way (not at the end of the rule), causing problems with some yacc implementations. (cherry picked from commit 835c266e5a5a421fb8b65077e053e06e43fb326a) --- cfg.y | 60 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cfg.y b/cfg.y index 9b4c0d1..2c488a2 100644 --- a/cfg.y +++ b/cfg.y @@ -540,7 +540,7 @@ extern char *finame; %left GT LT GTE LTE %left PLUS MINUS %left STAR SLASH MODULO -%right NOT +%right NOT UNARY %right DEFINED %right INTCAST STRCAST %left DOT @@ -730,7 +730,7 @@ id_lst: ; intno: NUMBER - | MINUS %prec NOT NUMBER { $$=-$2; } + | MINUS NUMBER %prec UNARY { $$=-$2; } ; flags_decl: FLAGS_DECL flag_list @@ -1840,41 +1840,41 @@ eip_op: SRCIP { $$=SRCIP_O; } exp_elem: - METHOD strop %prec EQUAL_T rval_expr + METHOD strop rval_expr %prec EQUAL_T {$$= mk_elem($2, METHOD_O, 0, RVE_ST, $3);} - | METHOD strop %prec EQUAL_T ID + | METHOD strop ID %prec EQUAL_T {$$ = mk_elem($2, METHOD_O, 0, STRING_ST,$3); } | METHOD strop error { $$=0; yyerror("string expected"); } | METHOD error { $$=0; yyerror("invalid operator,== , !=, or =~ expected"); } - | uri_type strop %prec EQUAL_T rval_expr + | uri_type strop rval_expr %prec EQUAL_T {$$ = mk_elem($2, $1, 0, RVE_ST, $3); } - | uri_type strop %prec EQUAL_T MYSELF + | uri_type strop MYSELF %prec EQUAL_T {$$=mk_elem($2, $1, 0, MYSELF_ST, 0); } - | uri_type strop %prec EQUAL_T error + | uri_type strop error %prec EQUAL_T { $$=0; yyerror("string or MYSELF expected"); } | uri_type error { $$=0; yyerror("invalid operator, == , != or =~ expected"); } - | eint_op cmpop %prec GT rval_expr { $$=mk_elem($2, $1, 0, RVE_ST, $3 ); } - | eint_op equalop %prec EQUAL_T rval_expr + | eint_op cmpop rval_expr %prec GT { $$=mk_elem($2, $1, 0, RVE_ST, $3 ); } + | eint_op equalop rval_expr %prec EQUAL_T { $$=mk_elem($2, $1, 0, RVE_ST, $3 ); } | eint_op cmpop error { $$=0; yyerror("number expected"); } | eint_op equalop error { $$=0; yyerror("number expected"); } | eint_op error { $$=0; yyerror("==, !=, <,>, >= or <= expected"); } - | PROTO equalop %prec EQUAL_T proto + | PROTO equalop proto %prec EQUAL_T { $$=mk_elem($2, PROTO_O, 0, NUMBER_ST, (void*)$3 ); } - | PROTO equalop %prec EQUAL_T rval_expr + | PROTO equalop rval_expr %prec EQUAL_T { $$=mk_elem($2, PROTO_O, 0, RVE_ST, $3 ); } | PROTO equalop error { $$=0; yyerror("protocol expected (udp, tcp, tls or sctp)"); } - | SNDPROTO equalop %prec EQUAL_T proto + | SNDPROTO equalop proto %prec EQUAL_T { $$=mk_elem($2, SNDPROTO_O, 0, NUMBER_ST, (void*)$3 ); } - | SNDPROTO equalop %prec EQUAL_T rval_expr + | SNDPROTO equalop rval_expr %prec EQUAL_T { $$=mk_elem($2, SNDPROTO_O, 0, RVE_ST, $3 ); } | SNDPROTO equalop error { $$=0; yyerror("protocol expected (udp, tcp, tls or sctp)"); } - | eip_op strop %prec EQUAL_T ipnet { $$=mk_elem($2, $1, 0, NET_ST, $3); } - | eip_op strop %prec EQUAL_T rval_expr { + | eip_op strop ipnet %prec EQUAL_T { $$=mk_elem($2, $1, 0, NET_ST, $3); } + | eip_op strop rval_expr %prec EQUAL_T { s_tmp.s=0; $$=0; if (rve_is_constant($3)){ @@ -1912,29 +1912,29 @@ exp_elem: $$=mk_elem($2, $1, 0, RVE_ST, $3); } } - | eip_op strop %prec EQUAL_T host + | eip_op strop host %prec EQUAL_T { $$=mk_elem($2, $1, 0, STRING_ST, $3); } - | eip_op strop %prec EQUAL_T MYSELF + | eip_op strop MYSELF %prec EQUAL_T { $$=mk_elem($2, $1, 0, MYSELF_ST, 0); } - | eip_op strop %prec EQUAL_T error + | eip_op strop error %prec EQUAL_T { $$=0; yyerror( "ip address or hostname expected" ); } | eip_op error { $$=0; yyerror("invalid operator, ==, != or =~ expected");} - | MYSELF equalop %prec EQUAL_T uri_type + | MYSELF equalop uri_type %prec EQUAL_T { $$=mk_elem($2, $3, 0, MYSELF_ST, 0); } - | MYSELF equalop %prec EQUAL_T eip_op + | MYSELF equalop eip_op %prec EQUAL_T { $$=mk_elem($2, $3, 0, MYSELF_ST, 0); } - | MYSELF equalop %prec EQUAL_T error + | MYSELF equalop error %prec EQUAL_T { $$=0; yyerror(" URI, SRCIP or DSTIP expected"); } | MYSELF error { $$=0; yyerror ("invalid operator, == or != expected"); } ; /* exp_elem2: - rval_expr cmpop %prec GT rval_expr + rval_expr cmpop rval_expr %prec GT { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} | - rval_expr equalop %prec EQUAL_T rval_expr + rval_expr equalop rval_expr %prec EQUAL_T { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} | rval_expr LOG_AND rval_expr { $$=mk_exp_rve(LOGAND_OP, $1, $3);} @@ -2527,7 +2527,7 @@ rval: intno {$$=mk_rve_rval(RV_INT, (void*)$1); } rve_un_op: NOT { $$=RVE_LNOT_OP; } - | MINUS %prec NOT { $$=RVE_UMINUS_OP; } + | MINUS %prec UNARY { $$=RVE_UMINUS_OP; } /* TODO: RVE_BOOL_OP, RVE_NOT_OP? */ ; @@ -2546,7 +2546,7 @@ rval_expr: rval { $$=$1; YYERROR; } } - | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } + | rve_un_op rval_expr %prec UNARY {$$=mk_rve1($1, $2); } | INTCAST rval_expr {$$=mk_rve1(RVE_INT_OP, $2); } | STRCAST rval_expr {$$=mk_rve1(RVE_STR_OP, $2); } | rval_expr PLUS rval_expr {$$=mk_rve2(RVE_PLUS_OP, $1, $3); } @@ -2556,8 +2556,8 @@ rval_expr: rval { $$=$1; | rval_expr MODULO rval_expr {$$=mk_rve2(RVE_MOD_OP, $1, $3); } | rval_expr BIN_OR rval_expr {$$=mk_rve2(RVE_BOR_OP, $1, $3); } | rval_expr BIN_AND rval_expr {$$=mk_rve2(RVE_BAND_OP, $1, $3);} - | rval_expr rve_cmpop %prec GT rval_expr { $$=mk_rve2( $2, $1, $3);} - | rval_expr rve_equalop %prec EQUAL_T rval_expr + | rval_expr rve_cmpop rval_expr %prec GT { $$=mk_rve2( $2, $1, $3);} + | rval_expr rve_equalop rval_expr %prec EQUAL_T { $$=mk_rve2( $2, $1, $3);} | rval_expr LOG_AND rval_expr { $$=mk_rve2(RVE_LAND_OP, $1, $3);} | rval_expr LOG_OR rval_expr { $$=mk_rve2(RVE_LOR_OP, $1, $3);} @@ -2565,7 +2565,7 @@ rval_expr: rval { $$=$1; | STRLEN LPAREN rval_expr RPAREN { $$=mk_rve1(RVE_STRLEN_OP, $3);} | STREMPTY LPAREN rval_expr RPAREN {$$=mk_rve1(RVE_STREMPTY_OP, $3);} | DEFINED rval_expr { $$=mk_rve1(RVE_DEFINED_OP, $2);} - | rve_un_op %prec NOT error { $$=0; yyerror("bad expression"); } + | rve_un_op error %prec UNARY { $$=0; yyerror("bad expression"); } | INTCAST error { $$=0; yyerror("bad expression"); } | STRCAST error { $$=0; yyerror("bad expression"); } | rval_expr PLUS error { $$=0; yyerror("bad expression"); } @@ -2575,9 +2575,9 @@ rval_expr: rval { $$=$1; | rval_expr MODULO error { $$=0; yyerror("bad expression"); } | rval_expr BIN_OR error { $$=0; yyerror("bad expression"); } | rval_expr BIN_AND error { $$=0; yyerror("bad expression"); } - | rval_expr rve_cmpop %prec GT error + | rval_expr rve_cmpop error %prec GT { $$=0; yyerror("bad expression"); } - | rval_expr rve_equalop %prec EQUAL_T error + | rval_expr rve_equalop error %prec EQUAL_T { $$=0; yyerror("bad expression"); } | rval_expr LOG_AND error { $$=0; yyerror("bad expression"); } | rval_expr LOG_OR error { $$=0; yyerror("bad expression"); }

15 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev