- t_write fixed (reported by Stefan Sayer)
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Mon, 22 Nov 2004 22:51:17 +0000 (22:51 +0000)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Mon, 22 Nov 2004 22:51:17 +0000 (22:51 +0000)
 - forward.h update_sock_struct_from_ip typo fixed (reported by Richard Fogel)

Makefile.defs
forward.h
modules/tm/t_fifo.c

index 61d5c6f..7e0389c 100644 (file)
@@ -50,7 +50,7 @@ MAIN_NAME=ser
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   99
-EXTRAVERSION = -dev17
+EXTRAVERSION = -dev18
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
index 1e0665f..41bf2d8 100644 (file)
--- a/forward.h
+++ b/forward.h
@@ -66,7 +66,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,
 /* use src_ip, port=src_port if rport, via port if via port, 5060 otherwise */
 #define update_sock_struct_from_ip(  to, msg ) \
        init_su((to), &(msg)->rcv.src_ip, \
-                       (((msg)->via1->rport)||((msg)->msg_flags&&FL_FORCE_RPORT))? \
+                       (((msg)->via1->rport)||((msg)->msg_flags&FL_FORCE_RPORT))? \
                                                        (msg)->rcv.src_port: \
                                                        ((msg)->via1->port)?(msg)->via1->port: SIP_PORT )
 
index ed8d641..a559b5b 100644 (file)
@@ -457,10 +457,10 @@ int fixup_t_write( void** param, int param_no)
                                        "<%s>\n",s);
                                return E_CFG;
                        }
-                       *param=(void*)twi;
                } else {
                        twi->action.len = strlen(twi->action.s);
                }
+               *param=(void*)twi;
        }
 
        return 0;