Merge trunk and 3.1 branch

Makefile

@@ -274,6 +274,10 @@ module_group_kpython=app_python
 # K geoip module
 module_group_kgeoip=geoip
 
+# k redis module
+module_group_kredis=ndb_redis
+
+
 # if not set on the cmd. line, env or in the modules.lst (cfg_group_include)
 # exclude the below modules.
 ifneq ($(group_include)$(cfg_group_include),)

config.h

@@ -141,7 +141,7 @@
 #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN
 
 #ifndef PKG_MEM_SIZE
-#define PKG_MEM_SIZE 8
+#define PKG_MEM_SIZE 16
 #endif
 #define PKG_MEM_POOL_SIZE PKG_MEM_SIZE*1024*1024	/*!< used only if PKG_MALLOC is defined*/
 
@@ -166,7 +166,7 @@
 #define MAX_RECEIVED_SIZE	57	/*!< forwarding  -- Via buffer dimensioning - Received header */
 #define MAX_RPORT_SIZE		13	/*!< forwarding  -- Via buffer dimensioning - Rport */
 
-#define MAX_BRANCHES    	12	/*!< maximum number of branches per transaction */
+#define MAX_BRANCHES    	24	/*!< maximum number of branches per transaction */
 
 #define MAX_PRINT_TEXT 		256	/*!< max length of the text of fifo 'print' command */
 

forward.c

@@ -124,6 +124,8 @@ static int sock_inet = -1;
 static int sock_inet6 = -1;
 #endif /* USE_IPV6 */
 
+static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg);
+
 struct socket_info* get_out_socket(union sockaddr_union* to, int proto)
 {
 	int* temp_sock;
@@ -830,6 +832,9 @@ int forward_reply(struct sip_msg* msg)
 				
 	} 
 #endif
+
+	apply_force_send_socket(&dst, msg);
+
 	if (msg_send(&dst, new_buf, new_len)<0)
 	{
 		STATS_RPL_FWD_DROP();
@@ -851,3 +856,10 @@ error:
 	if (new_buf) pkg_free(new_buf);
 	return -1;
 }
+
+static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg)
+{
+	if (msg->force_send_socket != 0) {
+		dst->send_sock = get_send_socket(msg, &dst->to, dst->proto);
+	}
+}

pkg/kamailio/deb/squeeze/changelog

@@ -1,3 +1,22 @@
+kamailio (3.1.3+sipwise7) unstable; urgency=low
+
+  * Fix redis module package creation
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Mon, 26 Sep 2011 15:31:35 +0200
+
+kamailio (3.1.3+sipwise6) unstable; urgency=low
+
+  * Increase PKG_MEM_SIZE to 16 and MAX_BRANCHES to 24.
+
+ -- Andreas Granig <agranig@sipwise.com>  Tue, 20 Sep 2011 15:31:35 +0200
+
+kamailio (3.1.3+sipwise5) unstable; urgency=low
+
+  * Cherry-picked 9dbf735878acc87bab1a0740476f1d106f89412f from
+    upstream: core: allow forcing send socket for replies
+
+ -- Andreas Granig <agranig@sipwise.com>  Tue, 20 Sep 2011 13:25:00 +0200
+
 kamailio (3.1.3+sipwise4) unstable; urgency=low
 
   * Cherry-picked b4fae8b9eee6d893aa2591bcc9039ea53a142161 from