Merge commit 'origin/ser_core_cvs'

* commit 'origin/ser_core_cvs':
  dns: fix build warnings when compiling without ipv6
  core: fix build on Darwin
  doc: tcp tunning update
  sctp: SO_REUSEADDR on the sctp sockets
  tcp: fix for async write
  another switch where PROTO_SCTP was missing - added case
  sctp protocol decoded in RPC dst_blacklist.view
  clean up whitespace in makefile
  added README.prefix_route
  Use explicit comparison with NULL, it's more clear and shuts off gcc,
  Fix warnings on LP64 plarforms out there (all 64-bit amd64/emt64 unixes
  added new module prefix_route
  update RPM spec file
  t_suspend() and t_continue() functions have been documented.
  dns: naptr local preferences fix
  more type punning warnings fixed
  avp: warning fixes & more sane usr_avp struct
  dns cache: fixed missing sctp SRV queries
  dns: fixed missing sctp SRV queries

Makefile

@@ -577,7 +577,7 @@ $(man_prefix)/$(man_dir)/man7:
 
 $(man_prefix)/$(man_dir)/man5:
 		mkdir -p $(man_prefix)/$(man_dir)/man5
-		
+
 # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) 
 install-cfg: $(cfg_prefix)/$(cfg_dir)
 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
@@ -600,7 +600,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
 		# radius dictionary
 		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.ser
 		$(INSTALL_CFG) etc/dictionary.ser $(cfg_prefix)/$(cfg_dir)
-		
+
 		# TLS configuration
 		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg
 		$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir)

config.h

@@ -126,6 +126,9 @@
 #define SRV_TLS_PREFIX "_sips._tcp."
 #define SRV_TLS_PREFIX_LEN (sizeof(SRV_TLS_PREFIX) - 1)
 
+#define SRV_SCTP_PREFIX "_sip._sctp."
+#define SRV_SCTP_PREFIX_LEN (sizeof(SRV_SCTP_PREFIX) - 1)
+
 #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN
 
 /*used only if PKG_MALLOC is defined*/

dns_cache.c

@@ -2392,6 +2392,12 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port,
 					tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
 					len=SRV_TLS_PREFIX_LEN + name->len;
 					break;
+				case PROTO_SCTP:
+					memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
+					memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
+					tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
+					len=SRV_SCTP_PREFIX_LEN + name->len;
+					break;
 				default:
 					LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",
 							(int)srv_proto);
@@ -3008,6 +3014,12 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h,  str* name,
 							tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
 							len=SRV_TLS_PREFIX_LEN + name->len;
 							break;
+						case PROTO_SCTP:
+							memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
+							memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
+							tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
+							len=SRV_SCTP_PREFIX_LEN + name->len;
+							break;
 						default:
 							LOG(L_CRIT, "BUG: sip_resolvehost: "
 									"unknown proto %d\n", (int)srv_proto);

doc/tcp_tunning.txt

@@ -55,6 +55,10 @@ fs.file-max                 - maximum number of fds that will be allocated
 1.5 other sysctl that might affect tcp connection rate or the maximum number
     of open connections
 
+fs.epoll.max_user_instances - maximum number of devices - per user (2.6.27.8+)
+fs.epoll.max_user_watches   - maximum number of "watched" fds - per user
+                              (2.6.27.8+)
+
 iptables  - remove the ip_conntrack module (it limits the maximum tcp
  connections, adds extra overhead (slow)). It's probably better to remove
   all the iptables modules.

dst_blacklist.c

@@ -879,6 +879,8 @@ static char* get_proto_name(unsigned char proto)
 			return "tcp";
 		case PROTO_TLS:
 			return "tls";
+		case PROTO_SCTP:
+			return "sctp";
 		default:
 			return "unknown";
 	}

io_wait.h

@@ -1104,7 +1104,7 @@ again:
 				   adding something to the changes array, close() and
 				   applying the changes */
 				LOG(L_INFO, "INFO: io_wait_loop_kqueue: kevent error on "
-							"fd %d: %s [%ld]\n", h->kq_array[r].ident,
+							"fd %ld: %s [%ld]\n", h->kq_array[r].ident,
 							strerror(h->kq_array[r].data),
 							(long)h->kq_array[r].data);
 			}else{ 
@@ -1142,6 +1142,9 @@ inline static int io_wait_loop_sigio_rt(io_wait_h* h, int t)
 	int sigio_fd;
 	struct fd_map* fm;
 	int revents;
+#ifdef SIGINFO64_WORKARROUND
+	int* pi;
+#endif
 	
 	
 	ret=1; /* 1 event per call normally */
@@ -1177,8 +1180,9 @@ again:
 		 *  On newer kernels this is fixed (si_band is long in the kernel too).
 		 * -- andrei */
 		if  ((_os_ver<0x020605) && (sizeof(siginfo.si_band)>sizeof(int))){
-			sigio_band=*((int*)(void*)&siginfo.si_band);
-			sigio_fd=*(((int*)(void*)&siginfo.si_band)+1);
+			pi=(int*)(void*)&siginfo.si_band; /* avoid type punning warnings */
+			sigio_band=*pi;
+			sigio_fd=*(pi+1);
 		}else
 #endif
 		{

ip_addr.c

@@ -190,7 +190,7 @@ int is_mcast(struct ip_addr* ip)
 		return IN_MULTICAST(htonl(ip->u.addr32[0]));
 #ifdef USE_IPV6
 	} else if (ip->af==AF_INET6){
-		return IN6_IS_ADDR_MULTICAST((struct in6_addr *)&ip->u.addr);
+		return IN6_IS_ADDR_MULTICAST((struct in6_addr*)ip->u.addr32);
 #endif /* USE_IPV6 */
 	} else {
 		LOG(L_ERR, "ERROR: is_mcast: Unsupported protocol family\n");

ip_addr.h

@@ -242,7 +242,7 @@ inline static int ip_addr_loopback(struct ip_addr* ip)
 		return ip->u.addr32[0]==htonl(INADDR_LOOPBACK);
 #ifdef USE_IPV6
 	else if (ip->af==AF_INET6)
-		return IN6_IS_ADDR_LOOPBACK((struct in6_addr *)&ip->u.addr32);
+		return IN6_IS_ADDR_LOOPBACK((struct in6_addr*)ip->u.addr32);
 #endif /* USE_IPV6 */
 	return 0;
 }

lib/binrpc/binrpc_api.c

@@ -500,7 +500,7 @@ static int get_reply(struct binrpc_handle *handle,
 		/* we must read all datagram in one read call, otherwise unread part is truncated and lost. Read will block execution */
 		if (crt - hdr_end < tl) {
 			snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1,
-				"get_reply: datagram truncated. Received: %d, Expected: %d.",
+				"get_reply: datagram truncated. Received: %ld, Expected: %d.",
 				crt-hdr_end, tl);
 			return FATAL_ERROR;		
 		}

lib/cds/sstr.h

@@ -77,7 +77,7 @@ char *zt_strdup(const char*src);
 
 /** frees string content if allocated */
 /* void str_free_content(str_t *s); */
-#define str_free_content(str)	do { if (str) { \
+#define str_free_content(str)	do { if (str != NULL) { \
 		if (((str)->len > 0) && ((str)->s)) cds_free((str)->s);\
 		(str)->len = 0; \
 		(str)->s = 0; \
@@ -85,13 +85,13 @@ char *zt_strdup(const char*src);
 
 /** frees string content if allocated and then the string itself */
 /* void str_free(str_t *s); */
-#define str_free(str)	do { if (str) { \
+#define str_free(str)	do { if (str != NULL) { \
 		if (((str)->len > 0) && ((str)->s)) cds_free((str)->s);\
 		cds_free(str); \
 	} } while (0)
 
 /* clears string content */
-#define str_clear(str)	do { if (str) { \
+#define str_clear(str)	do { if (str != NULL) { \
 		(str)->len = 0; \
 		(str)->s = 0; \
 	} } while (0)

modules/tm/README

@@ -1,3 +1,4 @@
+
 1. TM Module
 
 Jiri Kuthan
@@ -7,7 +8,7 @@ Jiri Kuthan
    Copyright © 2003 FhG FOKUS
    Revision History
    Revision $Revision$ $Date$
-     __________________________________________________________________
+     _________________________________________________________________
 
    1.1. Overview
    1.2. Known Issues
@@ -43,89 +44,94 @@ Jiri Kuthan
         1.4.1. t_relay_to_udp(ip, port), t_relay_to_udp(),
                 t_relay_to_tcp(ip, port) t_relay_to_tcp()
                 t_relay_to_tls(ip, port) t_relay_to_tls()
-                t_relay_to_sctp(ip, port) t_relay_to_sctp()
-
-        1.4.2. t_relay() t_relay(host, port)
-        1.4.3. t_on_failure(failure_route)
-        1.4.4. t_on_reply(onreply_route)
-        1.4.5. t_on_branch(branch_route)
-        1.4.6. append_branch()
-        1.4.7. t_newtran()
-        1.4.8. t_reply(code, reason_phrase)
-        1.4.9. t_lookup_request()
-        1.4.10. t_retransmit_reply()
-        1.4.11. t_release()
+                t_relay_to_sctp(ip, port) t_relay_to_sctp() 
+
+        1.4.2. t_relay() t_relay(host, port) 
+        1.4.3. t_on_failure(failure_route) 
+        1.4.4. t_on_reply(onreply_route) 
+        1.4.5. t_on_branch(branch_route) 
+        1.4.6. append_branch() 
+        1.4.7. t_newtran() 
+        1.4.8. t_reply(code, reason_phrase) 
+        1.4.9. t_lookup_request() 
+        1.4.10. t_retransmit_reply() 
+        1.4.11. t_release() 
         1.4.12. t_forward_nonack() t_forward_nonack(ip, port)
                 t_forward_nonack_udp(ip, port) t_forward_nonack_tcp(ip,
                 port) t_forward_nonack_tls(ip, port)
-                t_forward_nonack_sctp(ip, port)
-
-        1.4.13. t_set_fr(fr_inv_timeout [, fr_timeout])
-        1.4.14. t_reset_fr()
-        1.4.15. t_set_max_lifetime(inv_lifetime, noninv_lifetime)
-        1.4.16. t_reset_max_lifetime()
-        1.4.17. t_set_retr(retr_t1_interval, retr_t2_interval)
-        1.4.18. t_reset_retr()
-        1.4.19. t_set_auto_inv_100(0|1)
-        1.4.20. t_branch_timeout()
-        1.4.21. t_branch_replied()
-        1.4.22. t_any_timeout()
-        1.4.23. t_any_replied()
-        1.4.24. t_grep_status("code")
-        1.4.25. t_is_canceled()
-        1.4.26. t_relay_cancel()
-        1.4.27. t_drop_replies()
-        1.4.28. t_save_lumps()
+                t_forward_nonack_sctp(ip, port) 
+
+        1.4.13. t_set_fr(fr_inv_timeout [, fr_timeout]) 
+        1.4.14. t_reset_fr() 
+        1.4.15. t_set_max_lifetime(inv_lifetime, noninv_lifetime) 
+        1.4.16. t_reset_max_lifetime() 
+        1.4.17. t_set_retr(retr_t1_interval, retr_t2_interval) 
+        1.4.18. t_reset_retr() 
+        1.4.19. t_set_auto_inv_100(0|1) 
+        1.4.20. t_branch_timeout() 
+        1.4.21. t_branch_replied() 
+        1.4.22. t_any_timeout() 
+        1.4.23. t_any_replied() 
+        1.4.24. t_grep_status("code") 
+        1.4.25. t_is_canceled() 
+        1.4.26. t_relay_cancel() 
+        1.4.27. t_drop_replies() 
+        1.4.28. t_save_lumps() 
 
    1.5. TM Module API
 
         1.5.1. Defines
         1.5.2. Functions
 
-              1.5.2.1. register_tmcb(cb_type, cb_func)
-              1.5.2.2. load_tm(*import_structure)
+              1.5.2.1. register_tmcb(cb_type, cb_func) 
+              1.5.2.2. load_tm(*import_structure) 
+              1.5.2.3. int t_suspend(struct sip_msg *msg, unsigned int
+                      *hash_index, unsigned int *label) 
+
+              1.5.2.4. int t_continue(unsigned int hash_index, unsigned
+                      int label, struct action *route) 
 
 1.1. Overview
 
-   TM module enables stateful processing of SIP transactions. The main use
-   of stateful logic, which is costly in terms of memory and CPU, is some
-   services inherently need state. For example, transaction-based
+   TM module enables stateful processing of SIP transactions. The main
+   use of stateful logic, which is costly in terms of memory and CPU, is
+   some services inherently need state. For example, transaction-based
    accounting (module acc) needs to process transaction state as opposed
    to individual messages, and any kinds of forking must be implemented
    statefully. Other use of stateful processing is it trading CPU caused
    by retransmission processing for memory. That makes however only sense
    if CPU consumption per request is huge. For example, if you want to
-   avoid costly DNS resolution for every retransmission of a request to an
-   unresolvable destination, use stateful mode. Then, only the initial
+   avoid costly DNS resolution for every retransmission of a request to
+   an unresolvable destination, use stateful mode. Then, only the initial
    message burdens server by DNS queries, subsequent retransmissions will
    be dropped and will not result in more processes blocked by DNS
    resolution. The price is more memory consumption and higher processing
    latency.
 
    From user's perspective, there are these major functions : t_relay,
-   t_relay_to_udp and t_relay_to_tcp. All of them setup transaction state,
-   absorb retransmissions from upstream, generate downstream
+   t_relay_to_udp and t_relay_to_tcp. All of them setup transaction
+   state, absorb retransmissions from upstream, generate downstream
    retransmissions and correlate replies to requests. t_relay forwards to
    current URI (be it original request's URI or a URI changed by some of
    URI-modifying functions, such as sethost). t_relay_to_udp and
    t_relay_to_tcp forward to a specific address over UDP or TCP
    respectively.
 
-   In general, if TM is used, it copies clones of received SIP messages in
-   shared memory. That costs the memory and also CPU time (memcpys,
-   lookups, shmem locks, etc.) Note that non-TM functions operate over the
-   received message in private memory, that means that any core operations
-   will have no effect on statefully processed messages after creating the
-   transactional state. For example, calling record_route after t_relay is
-   pretty useless, as the RR is added to privately held message whereas
-   its TM clone is being forwarded.
+   In general, if TM is used, it copies clones of received SIP messages
+   in shared memory. That costs the memory and also CPU time (memcpys,
+   lookups, shmem locks, etc.) Note that non-TM functions operate over
+   the received message in private memory, that means that any core
+   operations will have no effect on statefully processed messages after
+   creating the transactional state. For example, calling record_route
+   after t_relay is pretty useless, as the RR is added to privately held
+   message whereas its TM clone is being forwarded.
 
    TM is quite big and uneasy to program--lot of mutexes, shared memory
-   access, malloc and free, timers--you really need to be careful when you
-   do anything. To simplify TM programming, there is the instrument of
-   callbacks. The callback mechanisms allow programmers to register their
-   functions to specific event. See t_hooks.h for a list of possible
-   events.
+   access, malloc and free, timers--you really need to be careful when
+   you do anything. To simplify TM programming, there is the instrument
+   of callbacks. The callback mechanisms allow programmers to register
+   their functions to specific event. See t_hooks.h for a list of
+   possible events.
 
    Other things programmers may want to know is UAC--it is a very
    simplistic code which allows you to generate your own transactions.
@@ -136,16 +142,16 @@ Jiri Kuthan
 
 1.2. Known Issues
 
-     * Possibly, performance could be improved by not parsing non-INVITEs,
-       as they do not be replied with 100, and do not result in
-       ACK/CANCELs, and other things which take parsing. However, we need
-       to rethink whether we don't need parsed headers later for something
-       else. Remember, when we now conserver a request in sh_mem, we can't
-       apply any pkg_mem operations to it any more. (that might be
-       redesigned too).
-     * Another performance improvement may be achieved by not parsing CSeq
-       in replies until reply branch matches branch of an INVITE/CANCEL in
-       transaction table.
+     * Possibly, performance could be improved by not parsing
+       non-INVITEs, as they do not be replied with 100, and do not result
+       in ACK/CANCELs, and other things which take parsing. However, we
+       need to rethink whether we don't need parsed headers later for
+       something else. Remember, when we now conserver a request in
+       sh_mem, we can't apply any pkg_mem operations to it any more.
+       (that might be redesigned too).
+     * Another performance improvement may be achieved by not parsing
+       CSeq in replies until reply branch matches branch of an
+       INVITE/CANCEL in transaction table.
      * t_replicate should be done more cleanly--Vias, Routes, etc. should
        be removed from a message prior to replicating it (well, does not
        matter any longer so much as there is a new replication module).
@@ -207,8 +213,8 @@ modparam("tm", "fr_inv_timer", 180000)
    fr_inv_timer will still be restarted for each increasing reply (e.g.
    180, 181, 182, ...). Another example when a transaction can live
    substantially more then its fr_inv_timer and where max_inv_lifetime
-   will help is when dns failover is used (each failed dns destination can
-   introduce a new branch).
+   will help is when dns failover is used (each failed dns destination
+   can introduce a new branch).
 
    The default value is 180000 ms (180 seconds - the rfc3261 timer C
    value).
@@ -241,7 +247,8 @@ modparam("tm", "max_inv_lifetime", 150000)
    failover is used (each failed dns destination can introduce a new
    branch).
 
-   The default value is 32000 ms (32 seconds - the rfc3261 timer F value).
+   The default value is 32000 ms (32 seconds - the rfc3261 timer F
+   value).
 
    See also: max_inv_lifetime, t_set_max_lifetime() (allows changing
    max_noninv_lifetime on a per transaction basis), t_reset_max_lifetime
@@ -254,11 +261,11 @@ modparam("tm", "max_inv_lifetime", 30000)
 
 1.3.5. wt_timer (integer)
 
-   Time for which a transaction stays in memory to absorb delayed messages
-   after it completed (in milliseconds); also, when this timer hits,
-   retransmission of local cancels is stopped (a puristic but complex
-   behavior would be not to enter wait state until local branches are
-   finished by a final reply or FR timer--we simplified).
+   Time for which a transaction stays in memory to absorb delayed
+   messages after it completed (in milliseconds); also, when this timer
+   hits, retransmission of local cancels is stopped (a puristic but
+   complex behavior would be not to enter wait state until local branches
+   are finished by a final reply or FR timer--we simplified).
 
    Default value is 5000 ms (5 seconds).
 
@@ -272,8 +279,8 @@ modparam("tm", "wt_timer", 1000)
    Time after which a to-be-deleted transaction currently ref-ed by a
    process will be tried to be deleted again (in milliseconds).
 
-   Note: this parameter is obsolete for ser 2.1 (in 2.1 the transaction is
-   deleted the moment it's not referenced anymore).
+   Note: this parameter is obsolete for ser 2.1 (in 2.1 the transaction
+   is deleted the moment it's not referenced anymore).
 
    Default value is 200 milliseconds.
 
@@ -308,15 +315,16 @@ modparam("tm", "retr_timer2", 2000)
 
 1.3.9. noisy_ctimer (integer)
 
-   If set, INVITE transactions that time-out (FR INV timer) will be always
-   replied. If it's not set, the transaction has only one branch and no
-   response was ever received on this branch, it will be silently dropped
-   (no 408 reply will be generated) This behavior is overridden if a
-   request is forked, the transaction has a failure route or callback, or
-   some functionality explicitly turned it on for a transaction (like acc
-   does to avoid unaccounted transactions due to expired timer). Turn this
-   off only if you know the client UACs will timeout and their timeout
-   interval for INVITEs is lower or equal than tm's fr_inv_timer.
+   If set, INVITE transactions that time-out (FR INV timer) will be
+   always replied. If it's not set, the transaction has only one branch
+   and no response was ever received on this branch, it will be silently
+   dropped (no 408 reply will be generated) This behavior is overridden
+   if a request is forked, the transaction has a failure route or
+   callback, or some functionality explicitly turned it on for a
+   transaction (like acc does to avoid unaccounted transactions due to
+   expired timer). Turn this off only if you know the client UACs will
+   timeout and their timeout interval for INVITEs is lower or equal than
+   tm's fr_inv_timer.
 
    Default value is 1 (on).
 
@@ -329,9 +337,9 @@ modparam("tm", "noisy_ctimer", 1)
 
    If set (default), the fr_inv_timer for an INVITE transaction will be
    restarted for each provisional reply received (rfc3261 mandated
-   behaviour). If not set, the fr_inv_timer will be restarted only for the
-   first provisional replies and for increasing replies greater or equal
-   180 (e.g. 180, 181, 182, 185, ...).
+   behaviour). If not set, the fr_inv_timer will be restarted only for
+   the first provisional replies and for increasing replies greater or
+   equal 180 (e.g. 180, 181, 182, 185, ...).
 
    Setting it to 0 is especially useful when dealing with bad UAs that
    continuously retransmit 180s, not allowing the transaction to timeout
@@ -354,8 +362,8 @@ modparam("tm", "restart_fr_on_each_reply", 0)
    Setting it to 0 one can be used to enable doing first some tests or
    pre-processing on the INVITE and only if some conditions are met
    manually send a 100 (using t_reply()). Note however that in this case
-   all the 100s have to be sent "by hand". t_set_auto_inv_100() might help
-   to selectively turn off this feature only for some specific
+   all the 100s have to be sent "by hand". t_set_auto_inv_100() might
+   help to selectively turn off this feature only for some specific
    transactions.
 
    Default value is 1 (on).
@@ -371,8 +379,8 @@ modparam("tm", "auto_inv_100", 0)
 
    Unix socket transmission timeout, in milliseconds.
 
-   If unix sockets are used (e.g.: to communicate with sems) and sending a
-   message on a unix socket takes longer then unix_tx_timeout, the send
+   If unix sockets are used (e.g.: to communicate with sems) and sending
+   a message on a unix socket takes longer then unix_tx_timeout, the send
    will fail.
 
    The default value is 500 milliseconds.
@@ -389,8 +397,8 @@ modparam("tm", "unix_tx_timeout", 250)
    Proxy-Authenticate headers from all the 401 and 407 replies will be
    aggregated in a new final reply. If only one branch received the
    winning 401 or 407 then this reply will be forwarded (no new one will
-   be built). If 0 only the first 401, or if no 401 was received the first
-   407, will be forwarded (no header aggregation).
+   be built). If 0 only the first 401, or if no 401 was received the
+   first 407, will be forwarded (no header aggregation).
 
    Default value is 1 (required by rfc3261).
 
@@ -403,15 +411,15 @@ modparam("tm", "aggregate_challenges", 0)
 
    If set (default), the CANCEL and negative ACK requests are constructed
    from the INVITE message which was sent out instead of building them
-   from the received request. The disadvantage is that the outgoing INVITE
-   has to be partially re-parsed, the advantage is that the CANCEL/ACK is
-   always RFC 3261-compliant, it always contains the same route-set as the
-   INVITE message. Do not disable the INVITE re-parsing for example in the
-   following cases:
+   from the received request. The disadvantage is that the outgoing
+   INVITE has to be partially re-parsed, the advantage is that the
+   CANCEL/ACK is always RFC 3261-compliant, it always contains the same
+   route-set as the INVITE message. Do not disable the INVITE re-parsing
+   for example in the following cases:
 
    - The INVITE contains a preloaded route-set, and SER forwards the
-   message to the next hop according to the Route header. The Route header
-   is not removed in the CANCEL without reparse_invite=1.
+   message to the next hop according to the Route header. The Route
+   header is not removed in the CANCEL without reparse_invite=1.
 
    - SER record-routes, thus an in-dialog INVITE contains a Route header
    which is removed during loose routing. If the in-dialog INVITE is
@@ -431,8 +439,8 @@ modparam("tm", "reparse_invite", 0)
    CANCEL and negative ACK messages if they were present in the outgoing
    INVITE.
 
-   Note, that the parameter value effects only those headers which are not
-   covered by RFC-3261 (which are neither mandatory nor prohibited in
+   Note, that the parameter value effects only those headers which are
+   not covered by RFC-3261 (which are neither mandatory nor prohibited in
    CANCEL and ACK), and the parameter can be used only together with
    reparse_invite=1.
 
@@ -448,8 +456,8 @@ modparam("tm", "ac_extra_hdrs", "myfavoriteheaders-")
    If set and the blacklist support is enabled, every 503 reply source is
    added to the blacklist. The initial blacklist timeout (or ttl) depends
    on the presence of a Retry-After header in the reply and the values of
-   the following tm parameters: blst_503_def_timeout, blst_503_min_timeout
-   and blst_503_max_timeout.
+   the following tm parameters: blst_503_def_timeout,
+   blst_503_min_timeout and blst_503_max_timeout.
 
    WARNING:blindly allowing 503 blacklisting could be very easily
    exploited for DOS attacks in most network setups.
@@ -550,8 +558,8 @@ modparam("tm", "blst_methods_lookup", 1)
    values are 0, 1, and 2.
 
    0 will immediately stop the request (INVITE) retransmission on the
-   branch and it will behave as if the branch was immediately replied with
-   a 487 (a fake internal 487 reply). The advantage is the unreplied
+   branch and it will behave as if the branch was immediately replied
+   with a 487 (a fake internal 487 reply). The advantage is the unreplied
    branches will be terminated immediately. However it introduces a race
    risk with a possible slightly delayed 2xx reply. In this case we could
    have an UA receiving a 2xx after a 487. Moreover this risk is greatly
@@ -563,16 +571,16 @@ modparam("tm", "blst_methods_lookup", 1)
    1 will keep retransmitting the request on unreplied branches. If a
    provisional answer is later received a CANCEL will be immediately sent
    back (attempting to quickly trigger a 487). This approach is race free
-   and avoids the 2xx after 487 problem, but it's more resource intensive:
-   faced with a branch towards and UA that doesn't answer, a CANCEL
-   attempt will keep the transaction alive for the whole timeout interval
-   (fr_timer).
+   and avoids the 2xx after 487 problem, but it's more resource
+   intensive: faced with a branch towards and UA that doesn't answer, a
+   CANCEL attempt will keep the transaction alive for the whole timeout
+   interval (fr_timer).
 
    2 will send and retransmit CANCEL even on unreplied branches, stopping
-   the request retransmissions. This has the same advantages as 1 and also
-   avoids the extra roundtrip in the case of the provisional reply, but
-   it's not RFC 3261 conforming (the RFC allows sending CANCELs only on
-   pending branches).
+   the request retransmissions. This has the same advantages as 1 and
+   also avoids the extra roundtrip in the case of the provisional reply,
+   but it's not RFC 3261 conforming (the RFC allows sending CANCELs only
+   on pending branches).
 
    The default value is 1.
 
@@ -595,11 +603,11 @@ modparam("tm", "cancel_b_method", 1)
    Note: If the parameter is set, branch route block and
    TMCB_REQUEST_FWDED callback are not called in case of the failover.
 
-   Disadvantage: only the via header is replaced in the message buffer, so
-   the outgoing socket address is not corrected in any other part of the
-   message. It is dangerous on multihomed hosts: when the new SIP request
-   after the DNS failover is sent via different interface than the first
-   request, the message can contain incorrect ip address in the
+   Disadvantage: only the via header is replaced in the message buffer,
+   so the outgoing socket address is not corrected in any other part of
+   the message. It is dangerous on multihomed hosts: when the new SIP
+   request after the DNS failover is sent via different interface than
+   the first request, the message can contain incorrect ip address in the
    Record-Route header for instance.
 
    Default value is 1.
@@ -612,9 +620,9 @@ modparam("tm", "reparse_on_dns_failover", 0)
 1.3.24. on_sl_reply (string)
 
    Sets reply route block, to which control is passed when a reply is
-   received that has no associated transaction. The reply is passed to the
-   core for stateless forwarding after the route block execution unless it
-   returns 0.
+   received that has no associated transaction. The reply is passed to
+   the core for stateless forwarding after the route block execution
+   unless it returns 0.
 
    Example 24. Set on_sl_reply parameter
 ...
@@ -648,8 +656,8 @@ t_relay_to_sctp(ip, port) t_relay_to_sctp()
      * port - Port number.
 
    If no parameters are specified the message is sent to a destination
-   derived from the message uri (using sip sepcific DNS lookups), but with
-   the protocol corresponding to the function name.
+   derived from the message uri (using sip sepcific DNS lookups), but
+   with the protocol corresponding to the function name.
 
    Example 25. t_relay_to_udp usage
 ...
@@ -662,21 +670,22 @@ else
 1.4.2.  t_relay() t_relay(host, port)
 
    Relay a message statefully either to the destination indicated in the
-   current URI (if called without any parameters) or to the specified host
-   and port. In the later case (host and port specified) the protocol used
-   is the same protocol on which the message was received.
+   current URI (if called without any parameters) or to the specified
+   host and port. In the later case (host and port specified) the
+   protocol used is the same protocol on which the message was received.
 
    t_relay() is the statefull version for forward(uri:host, uri:port)
    while t_relay(host, port) is similar to forward(host, port).
 
    In the forward to uri case (t_relay()), if the original URI was
    rewritten (by UsrLoc, RR, strip/prefix, etc.) the new URI will be
-   taken). The destination (including the protocol) is determined from the
-   uri, using SIP specific DNS resolving if needed (NAPTR, SRV a.s.o
+   taken). The destination (including the protocol) is determined from
+   the uri, using SIP specific DNS resolving if needed (NAPTR, SRV a.s.o
    depending also on the dns options).
 
    Returns a negative value on failure--you may still want to send a
-   negative reply upstream statelessly not to leave upstream UAC in lurch.
+   negative reply upstream statelessly not to leave upstream UAC in
+   lurch.
 
    Example 26. t_relay usage
 ...
@@ -690,19 +699,19 @@ if (!t_relay())
 1.4.3.  t_on_failure(failure_route)
 
    Sets failure routing block, to which control is passed after a
-   transaction completed with a negative result but before sending a final
-   reply. In the referred block, you can either start a new branch (good
-   for services such as forward_on_no_reply) or send a final reply on your
-   own (good for example for message silo, which received a negative reply
-   from upstream and wants to tell upstream "202 I will take care of it").
-   Note that the set of commands which are usable within failure_routes is
-   strictly limited to rewriting URI, initiating new branches, logging,
-   and sending stateful replies (t_reply). Any other commands may result
-   in unpredictable behavior and possible server failure. Note that
-   whenever failure_route is entered, uri is reset to value which it had
-   on relaying. If it temporarily changed during a reply_route processing,
-   subsequent reply_route will ignore the changed value and use again the
-   original one.
+   transaction completed with a negative result but before sending a
+   final reply. In the referred block, you can either start a new branch
+   (good for services such as forward_on_no_reply) or send a final reply
+   on your own (good for example for message silo, which received a
+   negative reply from upstream and wants to tell upstream "202 I will
+   take care of it"). Note that the set of commands which are usable
+   within failure_routes is strictly limited to rewriting URI, initiating
+   new branches, logging, and sending stateful replies (t_reply). Any
+   other commands may result in unpredictable behavior and possible
+   server failure. Note that whenever failure_route is entered, uri is
+   reset to value which it had on relaying. If it temporarily changed
+   during a reply_route processing, subsequent reply_route will ignore
+   the changed value and use again the original one.
 
    Meaning of the parameters is as follows:
      * failure_route - Failure route block to be called.
@@ -746,8 +755,8 @@ route {
 onreply_route[1] {
         if (status=~ "(183)|2[0-9][0-9]"){
                 force_rtp_proxy();
-                search_append('^(Contact|m)[ \t]*:.*sip:[^>[:cntrl:]]*', ';nat=y
-es');
+                search_append('^(Contact|m)[ \t]*:.*sip:[^>[:cntrl:]]*', ';nat=
+yes');
         }
         if (nat_uac_test("1")){
                 fix_nated_contact();
@@ -756,11 +765,12 @@ es');
 
 1.4.5.  t_on_branch(branch_route)
 
-   Sets the branch routing block, to which control is passed after forking
-   (when a new branch is created). For now branch routes are intended only
-   for last minute changes of the SIP messages (like adding new headers).
-   Note that the set of commands which are usable within branch_routes is
-   very limited. It is not possible to drop a message or generate a reply.
+   Sets the branch routing block, to which control is passed after
+   forking (when a new branch is created). For now branch routes are
+   intended only for last minute changes of the SIP messages (like adding
+   new headers). Note that the set of commands which are usable within
+   branch_routes is very limited. It is not possible to drop a message or
+   generate a reply.
 
    Meaning of the parameters is as follows:
      * branch_route - branch route block to be called.
@@ -848,8 +858,8 @@ t_retransmit_reply();
 
 1.4.11.  t_release()
 
-   Remove transaction from memory (it will be first put on a wait timer to
-   absorb delayed messages).
+   Remove transaction from memory (it will be first put on a wait timer
+   to absorb delayed messages).
 
    Example 35. t_release usage
 ...
@@ -907,9 +917,9 @@ branch_route[1] {
 
 1.4.14.  t_reset_fr()
 
-   Resets the fr_inv_timer and fr_timer for the current transaction to the
-   default values (set using the tm module parameters fr_inv_timer and
-   fr_timer).
+   Resets the fr_inv_timer and fr_timer for the current transaction to
+   the default values (set using the tm module parameters fr_inv_timer
+   and fr_timer).
 
    It will effectively cancel any previous calls to t_set_fr for the same
    transaction.
@@ -928,9 +938,9 @@ route {
 
    Sets the maximum lifetime for the current INVITE or non-INVITE
    transaction, or for transactions created during the same script
-   invocation, after calling this function (that's why it takes values for
-   both INVITE and non-INVITE). If one of the parameters is 0, its value
-   won't be changed.
+   invocation, after calling this function (that's why it takes values
+   for both INVITE and non-INVITE). If one of the parameters is 0, its
+   value won't be changed.
 
    It works as a per transaction max_inv_lifetime or max_noninv_lifetime.
 
@@ -959,8 +969,8 @@ route {
    transaction to the default value (set using the tm module parameter
    max_inv_lifetime or max_noninv_lifetime).
 
-   It will effectively cancel any previous calls to t_set_max_lifetime for
-   the same transaction.
+   It will effectively cancel any previous calls to t_set_max_lifetime
+   for the same transaction.
 
    See also: max_inv_lifetime, max_noninv_lifetime, t_set_max_lifetime.
 
@@ -976,9 +986,9 @@ route {
 
    Sets the retr_t1_interval and retr_t2_interval for the current
    transaction or for transactions created during the same script
-   invocation, after calling this function. If one of the parameters is 0,
-   it's value won't be changed. If the transaction is already created (e.g
-   called after t_relay() or in an onreply_route) all the existing
+   invocation, after calling this function. If one of the parameters is
+   0, it's value won't be changed. If the transaction is already created
+   (e.g called after t_relay() or in an onreply_route) all the existing
    branches will have their retransmissions intervals updated on-the-fly:
    if the retransmission interval for the branch has not yet reached T2
    the interval will be reset to retr_t1_interval, else to
@@ -986,11 +996,11 @@ route {
    interval expires (after the next retransmission, the next-next
    retransmission will take place at retr_t1_interval or
    retr_t2_interval). All new branches of the same transaction will start
-   with the new values. This function will work even if it's called in the
-   script before a transaction creating function (e.g.: t_set_retr(500,
-   4000); t_relay()). All new transaction created after this function
-   call, during the same script invocation will use the new values. Note
-   that this function will work only if tm is compile with
+   with the new values. This function will work even if it's called in
+   the script before a transaction creating function (e.g.:
+   t_set_retr(500, 4000); t_relay()). All new transaction created after
+   this function call, during the same script invocation will use the new
+   values. Note that this function will work only if tm is compile with
    -DTM_DIFF_RT_TIMEOUT (which increases every transaction size with 4
    bytes).
 
@@ -1146,11 +1156,11 @@ failure_route[0]{
 
 1.4.26.  t_relay_cancel()
 
-   Forwards the CANCEL if the corresponding INVITE transaction exists. The
-   function is supposed to be used at the very beginning of the script,
-   because the CANCELs can be caught and the rest of the script can be
-   bypassed this way. Do not disable reparse_invite module parameter, and
-   call t_relay_cancel() right after the sanity tests.
+   Forwards the CANCEL if the corresponding INVITE transaction exists.
+   The function is supposed to be used at the very beginning of the
+   script, because the CANCELs can be caught and the rest of the script
+   can be bypassed this way. Do not disable reparse_invite module
+   parameter, and call t_relay_cancel() right after the sanity tests.
 
    Return value is 0 (drop) if the corresponding INVITE was found and the
    CANCELs were successfully sent to the pending branches, true if the
@@ -1284,21 +1294,21 @@ end of body
 1.5.1. Defines
 
      * ACK_TAG enables stricter matching of acknowledgments including
-       to-tags. Without it, to-tags are ignored. It is disabled by default
-       for two reasons:
+       to-tags. Without it, to-tags are ignored. It is disabled by
+       default for two reasons:
           + It eliminates an unlikely race condition in which
-            transaction's to-tag is being rewritten by a 200 OK whereas an
-            ACK is being looked up by to-tag.
+            transaction's to-tag is being rewritten by a 200 OK whereas
+            an ACK is being looked up by to-tag.
           + It makes UACs happy who set wrong to-tags.
        It should not make a difference, as there may be only one negative
-       reply sent upstream and 200/ACKs are not matched as they constitute
-       another transaction. It will make no difference at all when the new
-       magic cookie matching is enabled anyway.
+       reply sent upstream and 200/ACKs are not matched as they
+       constitute another transaction. It will make no difference at all
+       when the new magic cookie matching is enabled anyway.
      * CANCEL_TAG similarly enables strict matching of CANCELs including
        to-tags--act of mercy to UACs, who screw up the to-tags (however,
-       it still depends on how forgiving the downstream UAS is). Like with
-       ACK_TAG, all this complex transactions matching goes with RFC3261's
-       magic cookie away anyway.
+       it still depends on how forgiving the downstream UAS is). Like
+       with ACK_TAG, all this complex transactions matching goes with
+       RFC3261's magic cookie away anyway.
 
 1.5.2. Functions
 
@@ -1318,3 +1328,57 @@ end of body
 
    Meaning of the parameters is as follows:
      * import_structure - Pointer to the import structure.
+
+1.5.2.3.  int t_suspend(struct sip_msg *msg, unsigned int *hash_index,
+unsigned int *label)
+
+   For programmatic use only. This function together with t_continue()
+   can be used to implement asynchronous actions: t_suspend() saves the
+   transaction, returns its identifiers, and t_continue() continues the
+   SIP request processing. (The request processing does not continue from
+   the same point in the script, a separate route block defined by the
+   parameter of t_continue() is executed instead. The reply lock is held
+   during the route block execution.) FR timer is ticking while the
+   transaction is suspended, and the transaction's failure route is
+   executed if t_continue() is not called in time.
+
+   Missing: message lumps are saved by t_suspend() and are not updated by
+   the subsequent t_relay(). This means that the modifications made
+   between them are lost.
+
+   Meaning of the parameters is as follows:
+     * msg - SIP message pointer.
+     * hash_index - transaction identifier.
+     * label - transaction identifier.
+
+   Return value: 0 - success, <0 - error.
+
+   Usage: Allocate a memory block for storing the transaction identifiers
+   (hash_index and label), and for storing also any variable related to
+   the async query. Before calling t_suspend(), register for the
+   following callbacks, and pass the pointer to the allocated shared
+   memory as a parameter: TMCB_ON_FAILURE, TMCB_DESTROY, and
+   TMCB_E2ECANCEL_IN (in case of INVITE transaction). The async operation
+   can be cancelled, if it is still pending, when TMCB_ON_FAILURE or
+   TMCB_E2ECANCEL_IN is called. TMCB_DESTROY is suitable to free the
+   shared memory allocated for the async and SIP transaction identifiers.
+   Once the async query result is available call t_continue(), see below.
+   The SIP transaction must exist before calling t_suspend(), and the
+   module function calling t_suspend() should return 0 to make sure that
+   the script processing does not continue.
+
+1.5.2.4.  int t_continue(unsigned int hash_index, unsigned int label, struct
+action *route)
+
+   For programmatic use only. This function is the pair of t_suspend(),
+   and is supposed to be called when the asynchronous query result is
+   available. The function executes a route block with the saved SIP
+   message. It is possible to add more branches to the transaction, or
+   send a reply from the route block.
+
+   Meaning of the parameters is as follows:
+     * hash_index - transaction identifier.
+     * label - transaction identifier.
+     * route - route block to execute.
+
+   Return value: 0 - success, <0 - error.

modules/tm/doc/api.xml

@@ -155,6 +155,93 @@ end of body
 		</listitem>
 	    </itemizedlist>
 	</section>
+
+	<section id="t_suspend">
+	    <title>
+	    	<function>int t_suspend(struct sip_msg *msg,
+			unsigned int *hash_index, unsigned int *label)</function>
+	    </title>
+	    <para>
+	    	For programmatic use only.
+		This function together with t_continue() can be used to
+		implement asynchronous actions: t_suspend() saves the transaction,
+		returns its identifiers, and t_continue() continues the
+		SIP request processing. (The request processing does not continue
+		from the same point in the script, a separate route block defined
+		by the parameter of t_continue() is executed instead. The reply lock
+		is held during the route block execution.)
+		FR timer is ticking while the transaction is suspended, and the
+		transaction's failure route is executed if t_continue() is not
+		called in time.
+	    </para>
+	    <para>
+		Missing: message lumps are saved by t_suspend() and are not updated by
+		the subsequent t_relay(). This means that the modifications made
+		between them are lost.
+	    </para>
+	    <para>Meaning of the parameters is as follows:</para>
+	    <itemizedlist>
+		<listitem>
+		    <para><emphasis>msg</emphasis> - SIP message pointer.
+		    </para>
+		</listitem>
+		<listitem>
+		    <para><emphasis>hash_index</emphasis> - transaction identifier.
+		    </para>
+		</listitem>
+		<listitem>
+		    <para><emphasis>label</emphasis> - transaction identifier.
+		    </para>
+		</listitem>
+	    </itemizedlist>
+	    <para>Return value: 0 - success, &lt;0 - error.</para>
+	    <para>
+		Usage: Allocate a memory block for storing the transaction identifiers
+		(hash_index and label), and for storing also any variable related to
+		the async query. Before calling t_suspend(), register for the following
+		callbacks, and pass the pointer to the allocated shared memory as
+		a parameter: TMCB_ON_FAILURE, TMCB_DESTROY, and TMCB_E2ECANCEL_IN
+		(in case of INVITE transaction). The async operation can be
+		cancelled, if it is still pending, when TMCB_ON_FAILURE or
+		TMCB_E2ECANCEL_IN is called. TMCB_DESTROY is suitable to free
+		the shared memory allocated for the async and SIP transaction identifiers.
+		Once the async query result is available call t_continue(), see below.
+		The SIP transaction must exist before calling t_suspend(), and the module
+		function calling t_suspend() should return 0 to make sure that the script
+		processing does not continue.
+	    </para>
+	</section>
+
+	<section id="t_continue">
+	    <title>
+		<function>int t_continue(unsigned int hash_index, unsigned int label,
+		                struct action *route)</function>
+	    </title>
+	    <para>
+		For programmatic use only.
+		This function is the pair of t_suspend(), and is supposed
+		to be called when the asynchronous query result is available.
+		The function executes a route block with the saved SIP message.
+		It is possible to add more branches to the transaction, or send
+		a reply from the route block.
+	    </para>
+	    <para>Meaning of the parameters is as follows:</para>
+	    <itemizedlist>
+		<listitem>
+		    <para><emphasis>hash_index</emphasis> - transaction identifier.
+		    </para>
+		</listitem>
+		<listitem>
+		    <para><emphasis>label</emphasis> - transaction identifier.
+		    </para>
+		</listitem>
+		<listitem>
+		    <para><emphasis>route</emphasis> - route block to execute.
+		    </para>
+		</listitem>
+	    </itemizedlist>
+	    <para>Return value: 0 - success, &lt;0 - error.</para>
+	</section>
     </section>
     
 </section>

modules/tm/t_cancel.c

@@ -194,6 +194,7 @@ int cancel_branch( struct cell *t, int branch, int flags )
 	struct retr_buf *crb, *irb;
 	int ret;
 	branch_bm_t tmp_bm;
+	void* pcbuf;
 
 	crb=&t->uac[branch].local_cancel;
 	irb=&t->uac[branch].request;
@@ -216,7 +217,8 @@ int cancel_branch( struct cell *t, int branch, int flags )
 			DBG("DEBUG: cancel_branch: no response ever received: "
 			    "giving up on cancel\n");
 			/* remove BUSY_BUFFER -- mark cancel buffer as not used */
-			atomic_set_long((void*)&crb->buffer, 0);
+			pcbuf=&crb->buffer; /* workaround for type punning warnings */
+			atomic_set_long(pcbuf, 0);
 			if (flags & F_CANCEL_B_FAKE_REPLY){
 				LOCK_REPLIES(t);
 				if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_bm, 1) == 
@@ -235,7 +237,8 @@ int cancel_branch( struct cell *t, int branch, int flags )
 				if (!(flags & F_CANCEL_B_FORCE_RETR))
 					stop_rb_retr(irb); /* stop retransmissions */
 				/* remove BUSY_BUFFER -- mark cancel buffer as not used */
-				atomic_set_long((void*)&crb->buffer, 0);
+				pcbuf=&crb->buffer; /* workaround for type punning warnings */
+				atomic_set_long(pcbuf, 0);
 				if (flags & F_CANCEL_B_FAKE_REPLY){
 					stop_rb_timers( irb ); /* stop even the fr timer */
 					LOCK_REPLIES(t);
@@ -262,7 +265,8 @@ int cancel_branch( struct cell *t, int branch, int flags )
 	if (!cancel) {
 		LOG(L_ERR, "ERROR: attempt to build a CANCEL failed\n");
 		/* remove BUSY_BUFFER -- mark cancel buffer as not used */
-		atomic_set_long((void*)&crb->buffer, 0);
+		pcbuf=&crb->buffer; /* workaround for type punning warnings */
+		atomic_set_long(pcbuf, 0);
 		return -1;
 	}
 	/* install cancel now */

modules/tm/t_suspend.c

@@ -38,6 +38,14 @@
 #include "timer.h"
 #include "t_suspend.h"
 
+/* Suspends the transaction for later use.
+ * Save the returned hash_index and label to get
+ * back to the SIP request processing, see the readme.
+ *
+ * Return value:
+ * 	0  - success
+ * 	<0 - failure
+ */
 int t_suspend(struct sip_msg *msg,
 		unsigned int *hash_index, unsigned int *label)
 {
@@ -85,6 +93,14 @@ int t_suspend(struct sip_msg *msg,
 	return 0;
 }
 
+/* Continues the SIP request processing previously saved by
+ * t_suspend(). The script does not continue from the same
+ * point, but a separate route block is executed instead.
+ *
+ * Return value:
+ * 	0  - success
+ * 	<0 - failure
+ */
 int t_continue(unsigned int hash_index, unsigned int label,
 		struct action *route)
 {

pkg/rpm/ser.spec-4.1

@@ -1,8 +1,8 @@
 %define name    ser
 %define ver     2.1.0
-%define rel     1
+%define rel     dev23b
 
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgres snmp cpl cpl-c extcmd
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgres snmp cpl cpl-c extcmd ldap
 %define MYSQL_MODULES		mysql
 %define JABBER_MODULES		jabber
 %define RADIUS_MODULES		auth_radius group_radius uri_radius
@@ -69,7 +69,7 @@ The ser-jabber package contains a sip to jabber message translator.
 %setup -n %{name}-%{ver}-%{rel}
 
 %build
-make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
+make all include_modules="tls" skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
 make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
 make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
 make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
@@ -78,7 +78,7 @@ make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 
-make install skip_modules="%EXCLUDED_MODULES" \
+make install include_modules="tls" skip_modules="%EXCLUDED_MODULES" \
 		basedir=$RPM_BUILD_ROOT \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
@@ -137,18 +137,21 @@ fi
 %doc %{_docdir}/ser/INSTALL
 %doc %{_docdir}/ser/README
 %doc %{_docdir}/ser/README-MODULES
+%doc %{_docdir}/ser/README.acc_syslog
 %doc %{_docdir}/ser/README.auth
 %doc %{_docdir}/ser/README.auth_db
 %doc %{_docdir}/ser/README.avp
 %doc %{_docdir}/ser/README.avp_db
-%doc %{_docdir}/ser/README.avpops
-%doc %{_docdir}/ser/README.dbtext
+%doc %{_docdir}/ser/README.cfg_db
 %doc %{_docdir}/ser/README.db_ops
 %doc %{_docdir}/ser/README.dispatcher
 %doc %{_docdir}/ser/README.diversion
 %doc %{_docdir}/ser/README.domain
 %doc %{_docdir}/ser/README.enum
+%doc %{_docdir}/ser/README.eval
 %doc %{_docdir}/ser/README.exec
+%doc %{_docdir}/ser/README.flatstore
+%doc %{_docdir}/ser/README.gflags
 %doc %{_docdir}/ser/README.lcr
 %doc %{_docdir}/ser/README.maxfwd
 %doc %{_docdir}/ser/README.msilo
@@ -157,15 +160,18 @@ fi
 %doc %{_docdir}/ser/README.pdt
 %doc %{_docdir}/ser/README.permissions
 %doc %{_docdir}/ser/README.pike
+%doc %{_docdir}/ser/README.prefix_route
 %doc %{_docdir}/ser/README.print
 %doc %{_docdir}/ser/README.ratelimit
 %doc %{_docdir}/ser/README.registrar
 %doc %{_docdir}/ser/README.rr
+%doc %{_docdir}/ser/README.sanity
 %doc %{_docdir}/ser/README.sl
 %doc %{_docdir}/ser/README.sms
 %doc %{_docdir}/ser/README.speeddial
 %doc %{_docdir}/ser/README.textops
 %doc %{_docdir}/ser/README.timer
+%doc %{_docdir}/ser/README.tls
 %doc %{_docdir}/ser/README.tm
 %doc %{_docdir}/ser/README.uac
 %doc %{_docdir}/ser/README.uri
@@ -178,21 +184,26 @@ fi
 %config %{_sysconfdir}/rc.d/init.d/*
 
 %dir %{_libdir}/ser
+%{_libdir}/ser/libser_cds.so
+%{_libdir}/ser/libser_cds.so.0
+%{_libdir}/ser/libser_cds.so.0.1
 %dir %{_libdir}/ser/modules
 %{_libdir}/ser/modules/acc_db.so
 %{_libdir}/ser/modules/acc_syslog.so
 %{_libdir}/ser/modules/auth.so
 %{_libdir}/ser/modules/auth_db.so
 %{_libdir}/ser/modules/avp.so
-%{_libdir}/ser/modules/avpops.so
 %{_libdir}/ser/modules/avp_db.so
+%{_libdir}/ser/modules/blst.so
+%{_libdir}/ser/modules/cfg_db.so
+%{_libdir}/ser/modules/cfg_rpc.so
 %{_libdir}/ser/modules/ctl.so
 %{_libdir}/ser/modules/db_ops.so
-%{_libdir}/ser/modules/dbtext.so
 %{_libdir}/ser/modules/dispatcher.so
 %{_libdir}/ser/modules/diversion.so
 %{_libdir}/ser/modules/domain.so
 %{_libdir}/ser/modules/enum.so
+%{_libdir}/ser/modules/eval.so
 %{_libdir}/ser/modules/exec.so
 %{_libdir}/ser/modules/fifo.so
 %{_libdir}/ser/modules/flatstore.so
@@ -206,6 +217,7 @@ fi
 %{_libdir}/ser/modules/pdt.so
 %{_libdir}/ser/modules/permissions.so
 %{_libdir}/ser/modules/pike.so
+%{_libdir}/ser/modules/prefix_route.so
 %{_libdir}/ser/modules/print.so
 %{_libdir}/ser/modules/ratelimit.so
 %{_libdir}/ser/modules/registrar.so
@@ -216,6 +228,7 @@ fi
 %{_libdir}/ser/modules/speeddial.so
 %{_libdir}/ser/modules/textops.so
 %{_libdir}/ser/modules/timer.so
+%{_libdir}/ser/modules/tls.so
 %{_libdir}/ser/modules/tm.so
 %{_libdir}/ser/modules/uac.so
 %{_libdir}/ser/modules/uri.so
@@ -237,6 +250,7 @@ fi
 
 %{_libdir}/ser/modules/mysql.so
 %{_sbindir}/ser_mysql.sh
+/usr/share/ser/*.sql
 
 %files jabber
 %defattr(-,root,root)

resolve.c

@@ -896,8 +896,9 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto,
 	if ((*crt==0) || ((*crt_proto!=n_proto) && 
 						( naptr_proto_preferred(n_proto, *crt_proto))) )
 			goto change;
-	if ((n->order<(*crt)->order) || ((n->order== (*crt)->order) &&
-									(n->pref < (*crt)->pref))){
+	if (!naptr_proto_preferred(*crt_proto, n_proto) && 
+			((n->order<(*crt)->order) || ((n->order== (*crt)->order) &&
+								(n->pref < (*crt)->pref)))){
 			goto change;
 	}
 #ifdef NAPTR_DBG
@@ -1019,6 +1020,11 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port,
 					memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len);
 					tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
 					break;
+				case PROTO_SCTP:
+					memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
+					memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
+					tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
+					break;
 				default:
 					LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",
 							srv_proto);

resolve.h

@@ -337,9 +337,11 @@ static inline struct hostent* _resolvehost(char* name)
 {
 	static struct hostent* he=0;
 #ifdef HAVE_GETIPNODEBYNAME 
+#ifdef USE_IPV6
 	int err;
 	static struct hostent* he2=0;
 #endif
+#endif
 #ifndef DNS_IP_HACK
 #ifdef USE_IPV6
 	int len;

sctp_server.c

@@ -216,6 +216,15 @@ static int sctp_init_sock_opt_common(int s)
 		}
 	}
 	
+	/* set reuseaddr */
+	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+						(void*)&optval, sizeof(optval))==-1){
+			LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt:"
+						" SO_REUSEADDR (%d): %s\n", optval, strerror(errno));
+			/* continue, non-critical */
+	}
+
+	
 	/* disable fragments interleave (SCTP_FRAGMENT_INTERLEAVE) --
 	 * we don't want partial delivery, so fragment interleave must be off too
 	 */

tcp_main.c

@@ -648,7 +648,7 @@ inline static int _wbufq_add(struct  tcp_connection* c, char* data,
 			last_free=wb->b_size;
 		}
 		crt_size=MIN_unsigned(last_free, size);
-		memcpy(wb->buf, data, crt_size);
+		memcpy(wb->buf+q->last_used, data, crt_size);
 		q->last_used+=crt_size;
 		size-=crt_size;
 		data+=crt_size;

usr_avp.c

@@ -154,7 +154,6 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val)
 	struct str_int_data *sid;
 	struct str_str_data *ssd;
 	int len;
-	void** p_data;
 
 	if (name.s.s == 0 && name.s.len == 0) {
 		LOG(L_ERR,"ERROR:avp:add_avp: 0 ID or NULL NAME AVP!");
@@ -169,15 +168,15 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val)
 			goto error;
 		}
 		if (flags&AVP_VAL_STR) {
-			len += sizeof(struct str_str_data)-sizeof(void*)
+			len += sizeof(struct str_str_data)-sizeof(union usr_avp_data)
 				+ name.s.len + 1 /* Terminating zero for regex search */
 				+ val.s.len + 1; /* Value is zero terminated */
 		} else {
-			len += sizeof(struct str_int_data)-sizeof(void*)
+			len += sizeof(struct str_int_data)-sizeof(union usr_avp_data)
 				+ name.s.len + 1; /* Terminating zero for regex search */
 		}
 	} else if (flags&AVP_VAL_STR) {
-		len += sizeof(str)-sizeof(void*) + val.s.len + 1;
+		len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1;
 	}
 
 	avp = (struct usr_avp*)shm_malloc( len );
@@ -189,17 +188,16 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val)
 	avp->flags = flags;
 	avp->id = (flags&AVP_NAME_STR)? compute_ID(&name.s) : name.n ;
 	avp->next = NULL;
-	p_data=&avp->data; /* strict aliasing /type punning warnings workarround */
 
 	switch ( flags&(AVP_NAME_STR|AVP_VAL_STR) )
 	{
 		case 0:
 			/* avp type ID, int value */
-			avp->data = (void*)(long)val.n;
+			avp->d.l = val.n;
 			break;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
-			sid = (struct str_int_data*)p_data;
+			sid = (struct str_int_data*)&avp->d.data[0];
 			sid->val = val.n;
 			sid->name.len =name.s.len;
 			sid->name.s = (char*)sid + sizeof(struct str_int_data);
@@ -208,7 +206,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val)
 			break;
 		case AVP_VAL_STR:
 			/* avp type ID, str value */
-			s = (str*)p_data;
+			s = (str*)&avp->d.data[0];
 			s->len = val.s.len;
 			s->s = (char*)s + sizeof(str);
 			memcpy( s->s, val.s.s , s->len);
@@ -216,7 +214,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val)
 			break;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
-			ssd = (struct str_str_data*)p_data;
+			ssd = (struct str_str_data*)&avp->d.data[0];
 			ssd->name.len = name.s.len;
 			ssd->name.s = (char*)ssd + sizeof(struct str_str_data);
 			memcpy( ssd->name.s , name.s.s, name.s.len);
@@ -298,7 +296,6 @@ int add_avp_before(avp_t *avp, avp_flags_t flags, avp_name_t name, avp_value_t v
 /* get value functions */
 inline str* get_avp_name(avp_t *avp)
 {
-	void** p_data; /* strict aliasing /type punning warnings workarround */
 	
 	switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) )
 	{
@@ -309,12 +306,10 @@ inline str* get_avp_name(avp_t *avp)
 			return 0;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
-			p_data=&avp->data;
-			return &((struct str_int_data*)p_data)->name;
+			return &((struct str_int_data*)&avp->d.data[0])->name;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
-			p_data=&avp->data;
-			return &((struct str_str_data*)p_data)->name;
+			return &((struct str_str_data*)&avp->d.data[0])->name;
 	}
 
 	LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n",
@@ -325,28 +320,26 @@ inline str* get_avp_name(avp_t *avp)
 
 inline void get_avp_val(avp_t *avp, avp_value_t *val)
 {
-	void** p_data; /* strict aliasing /type punning warnings workarround */
 	
 	if (avp==0 || val==0)
 		return;
 
-	p_data=&avp->data;
 	switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) ) {
 		case 0:
 			/* avp type ID, int value */
-			val->n = (long)(avp->data);
+			val->n = avp->d.l;
 			break;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
-			val->n = ((struct str_int_data*)p_data)->val;
+			val->n = ((struct str_int_data*)&avp->d.data[0])->val;
 			break;
 		case AVP_VAL_STR:
 			/* avp type ID, str value */
-			val->s = *(str*)(void*)(&avp->data);
+			val->s = *(str*)&avp->d.data[0];
 			break;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
-			val->s = (((struct str_str_data*)p_data)->val);
+			val->s = ((struct str_str_data*)&avp->d.data[0])->val;
 			break;
 	}
 }

usr_avp.h

@@ -89,12 +89,18 @@ typedef union {
 #define avp_value_t	int_str
 #define avp_index_t	unsigned short
 
+union usr_avp_data{
+	void *p; /* forces alignment */
+	long l;
+	char data[sizeof(void*)]; /* used to access other types, var length */
+};
+
 typedef struct usr_avp {
 	avp_id_t id;
-	     /* Flags that are kept for the AVP lifetime */
+	/* Flags that are kept for the AVP lifetime */
 	avp_flags_t flags;
 	struct usr_avp *next;
-	void *data;
+	union usr_avp_data d; /* var length */
 } avp_t;
 
 typedef avp_t* avp_list_t;