sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

sr closes tcp connection before register expires
by jh＠tutpro.com 08 Dec '09

08 Dec '09

ua sets up tcp connection to sr and registers. expires parameter of contact header is 3600 and tcp_persistent_flag was set before save() was called. after registering, ua sends some other requests and becomes idle 8 second later. 2 minutes 10 seconds after that, wireshark shows that sr closes the tcp connection. why is tcp connection closed? it looks like a bug to me, but perhaps i am missing something? -- juha

4 7

Kamailio 1.5 LDAP observations and issues
by Olle E. Johansson 07 Dec '09

07 Dec '09

- kamailio core dumps when it can't verify ssl certificate. Propably an error code the module does not parse. - I can't get the "DN" for a result. All attributes work. Will dig deeper into this, but if someone has solved these issues or seen them, I would appreciate feedback. Cheers, /O

2 4

IETF - pro and con
by Olle E. Johansson 05 Dec '09

05 Dec '09

There's been a lot of virtual slander of the work in the IETF on this list lately... I keep wondering, why doesn't people like us start working more in the IETF and change stuff? Are we not patience enough, are we not brilliant enough? For myself I can't spend much time on it, since it doesn't generate any immediate revenue. There's a lot of stuff I could do, but at the end of the month, I would have no salary that pays for food... It's quite simple. Which means that the result in the IETF is far away from reality and that we reach further separation between IETF SIP and practical implementations, which is BAD for the overall community. /O

7 6

git:sr_3.0: makefiles: clean-utils and proper-utils fix
by Andrei Pelinescu-Onciul 04 Dec '09

04 Dec '09

Module: sip-router Branch: sr_3.0 Commit: b8e67fd6d759b1a3a2f6acd61e0b7f8706a98d73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8e67fd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 4 18:16:25 2009 +0100 makefiles: clean-utils and proper-utils fix - clean-utils and proper-utils now work both from the main directory (for utils compiled by make utils or installed by make install-utils) and from the modules directories (for utils installed by a module) - make utils now works in module directories (compiles utils that would be installed by the module) --- Makefile | 22 ++++++++++++++++++++++ Makefile.modules | 31 +++++++++++++++++++++++++++++++ Makefile.rules | 25 ------------------------- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 7f2d496..d2d98c4 100644 --- a/Makefile +++ b/Makefile @@ -953,6 +953,28 @@ clean-libs: proper-libs realclean-libs distclean-libs maintainer-clean-libs: $(MAKE) -C lib $(patsubst %-libs,%,$@) +# utils cleaning targets + +.PHONY: clean-utils +clean-utils: + @for r in $(C_COMPILE_UTILS) $(C_INSTALL_UTILS) "" ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" clean ; \ + fi ; \ + done + +.PHONY: proper-utils +.PHONY: distclean-utils +.PHONY: realclean-utils +.PHONY: maintainer-clean-utils +proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ + clean_target=$(patsubst %-utils,%,$@) +proper-utils realclean-utils distclean-utils maintainer-clean-utils: + @for r in $(C_COMPILE_UTILS) $(C_INSTALL_UTILS) "" ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" $(clean_target); \ + fi ; \ + done # clean extra binary names (common "flavour" names) clean: clean-extra-names diff --git a/Makefile.modules b/Makefile.modules index f1f172b..1f226ba 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -139,14 +139,45 @@ install-libs: endif # $(SER_LIBS) +.PHONY: utils +.PHONY: clean-utils +.PHONY: proper-utils +.PHONY: distclean-utils +.PHONY: realclean-utils +.PHONY: maintainer-clean-utils ifneq (,$(MOD_INSTALL_UTILS)) install-utils: @for ut in $(MOD_INSTALL_UTILS) ; do \ $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ done; true +utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + $(call try_err, $(MAKE) -C "$$r" ) ;\ + done; true + +clean-utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" clean ; \ + fi ; \ + done + +proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ + clean_target=$(patsubst %-utils,%,$@) +proper-utils realclean-utils distclean-utils maintainer-clean-utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" $(clean_target); \ + fi ; \ + done + else +# ! MOD_INSTALL_UTILS install-utils: +utils: +clean-utils: +proper-utils realclean-utils distclean-utils maintainer-clean-utils: endif # $(MOD_INSTALL_UTILS) diff --git a/Makefile.rules b/Makefile.rules index 512f828..8f254f4 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -218,16 +218,6 @@ clean-modules: fi ; \ done -.PHONY: clean-utils -clean-utils: - @if [ -n "$(cmodules)" ]; then \ - for r in $(utils_compile) "" ; do \ - if [ -d "$$r" ]; then \ - $(MAKE) -C "$$r" clean ; \ - fi ; \ - done \ - fi - # make proper for the local directory .PHONY: proper .PHONY: distclean @@ -253,21 +243,6 @@ proper-modules realclean-modules distclean-modules maintainer-clean-modules: fi ; \ done -.PHONY: proper-utils -.PHONY: distclean-utils -.PHONY: realclean-utils -.PHONY: maintainer-clean-utils -proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ - clean_target=$(patsubst %-utils,%,$@) -proper-utils realclean-utils distclean-utils maintainer-clean-utils: - @if [ -n "$(cmodules)" ]; then \ - for r in $(utils_compile) "" ; do \ - if [ -d "$$r" ]; then \ - $(MAKE) -C "$$r" $(clean_target); \ - fi ; \ - done \ - fi - .PHONY: clean-tmp clean-tmp: -@rm -f TAGS tags *.dbg .*.swp

1 0

git:sr_3.0: sercmd: fix LIBS when installing from a module
by Andrei Pelinescu-Onciul 04 Dec '09

04 Dec '09

Module: sip-router Branch: sr_3.0 Commit: b0f00c3348b9c1429f6df5b39dcbd1ca939e9dfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0f00c3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> 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). --- 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 \

1 0

topoh limitation: REGISTER
by Klaus Darilion 04 Dec '09

04 Dec '09

Hi! I'm just testing topoh module and it does not protect relayed REGISTER requests - why? I found this piece of code which looks guilty: int th_skip_msg(sip_msg_t *msg) { if((get_cseq(msg)->method_id)&(METHOD_REGISTER|METHOD_PUBLISH)) return 1; return 0; } But why? IMO it is a valid use case, e.g. in our office all SIP requests ae sent via an outbound proxy before entering Internet. This outboundproxy does topology hiding - but currently not for REGISTER :-( regards klaus

1 0

Problems with mhomed
by Marius Zbihlei 03 Dec '09

03 Dec '09

As I see in sip-router and in kamailio, the mhomed implementation is very very slow . For each SIP packet a temporary socket is created, connected to the remote host and than checked to see what interface was selected to connect the socket(see method get_out_socket() in forward.c) As test have shown, this implementation, albeit correct from a funtional point of view, it's really too slow (or too expensive) to be used in medium-large production setups. I am currently working on a patch that mitigates this problem. The way the patch works is like this: 1. Get the routing table from the kernel via NETLINK sockets(done at start) 2. Construct a link list of routes, each entry for one interface(either real of virtual). The structure will hold the address of the interface and the destination (as reported by route -n)(this will be a CIDR entry). Also it's decided if on that interface a default route has been assigned(done at start) 3. get_out_socket() will be changed to loop thru the list described above and decide based on the destination member of the struct describe above on what interface the packet is to be routed. If no destination is matched than the default one is selected.(done for each packet) 4.A NETLINK socket will be added to the poll()ing loop so it can monitor the changes in the kernel's routing table and update the internal structure if necessary.(done at start)(The table is updated only if administration changes the routing table via route or ip route commands) I have implemented the first 3 steps and preliminary tests look ok. step for is required only if we want updates on the routing table in real time. Limitations: 1. This only works for Linux, AF_INET sockets. AF_INET6 is also supported but i don't know to what extent 2. For BSD, route sockets should replace the NETLINK sockets What are your suggestion about this? Should this patch (when completely finished) be commited? Thanks for any suggestions! Marius.

3 4

git:sr_3.0: ctl: fix #includes on solaris
by Andrei Pelinescu-Onciul 02 Dec '09

02 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 4920290b90947fa59f7e794fc92abd6796950c33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4920290… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 2 20:14:54 2009 -0500 ctl: fix #includes on solaris --- 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"

1 0

git:sr_3.0: core: pid_t warning fixes for solaris
by Andrei Pelinescu-Onciul 02 Dec '09

02 Dec '09

Module: sip-router Branch: sr_3.0 Commit: ca351abe9bd52f24003a96ed4f9a420739728496 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca351ab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 2 20:15:36 2009 -0500 core: pid_t warning fixes for solaris --- 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

1 0

git:sr_3.0: parser: fix for solaris yacc compatibility
by Andrei Pelinescu-Onciul 02 Dec '09

02 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 835c266e5a5a421fb8b65077e053e06e43fb326a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=835c266… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> 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. --- cfg.y | 60 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cfg.y b/cfg.y index 585edf5..bfe45e4 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"); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009