Migrate modules from append_branch() to append_msg_branch()

Completes 31092f1

Author: bogdan-iancu

modules/cpl_c/cpl_sig.c

@@ -38,6 +38,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs,
 													unsigned char flag)
 {
 	struct location *foo;
+	struct msg_branch branch;
 	int bflags;
 	int r;
 
@@ -75,8 +76,12 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs,
 		bflags = ((*locs)->flags&CPL_LOC_NATED) ? cpl_fct.ulb.nat_flag : 0 ;
 		LM_DBG("appending branch <%.*s>, flags %d\n",
 			(*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags);
-		if(append_branch(msg, &(*locs)->addr.uri, &(*locs)->addr.received,0,
-		Q_UNSPECIFIED, bflags, 0)==-1){
+		memset( &branch, 0, sizeof branch);
+		branch.uri = (*locs)->addr.uri;
+		branch.dst_uri = (*locs)->addr.received;
+		branch.q = Q_UNSPECIFIED;
+		branch.bflags = bflags;
+		if (append_msg_branch(&branch)==-1){
 			LM_ERR("failed when appending branch <%s>\n",(*locs)->addr.uri.s);
 			goto error;
 		}

modules/osp/orig_transaction.c

@@ -967,6 +967,7 @@ static int ospPrepareDestination(
     osp_inbound* inbound = ospGetInboundInfo();
     osp_dest* dest = ospGetNextOrigDestination();
     int result = MODULE_RETURNCODE_TRUE;
+    struct msg_branch branch;
 
     if (inbound != NULL) {
         if (dest != NULL) {
@@ -1004,7 +1005,10 @@ static int ospPrepareDestination(
                             set_ruri(msg, &newuri);
                             set_ruri_q(msg, qvalue);
                         } else {
-                            append_branch(msg, &newuri, NULL, NULL, qvalue, 0, NULL);
+                            memset( &branch, 0, sizeof branch);
+                            branch.uri = newuri;
+                            branch.q = qvalue;
+                            append_msg_branch( &branch );
                         }
 
                         /* Do not add route specific OSP information */
@@ -1032,7 +1036,10 @@ static int ospPrepareDestination(
                     if (isfirst == OSP_FIRST_ROUTE) {
                         set_ruri(msg, &newuri);
                     } else {
-                        append_branch(msg, &newuri, NULL, NULL, Q_UNSPECIFIED, 0, NULL);
+                        memset( &branch, 0, sizeof branch);
+                        branch.uri = newuri;
+                        branch.q = Q_UNSPECIFIED;
+                        append_msg_branch( &branch );
                     }
 
                     /* Do not add route specific OSP information */

modules/perl/opensipsxs.xs

@@ -1136,6 +1136,7 @@ append_branch(self, branch = NULL, qval = NULL)
 	int err = 0;
 	struct action *act = NULL;
 	str branch_s;
+	struct msg_branch mbranch;
   INIT:
   CODE:
   	if (!msg) {
@@ -1162,10 +1163,16 @@ append_branch(self, branch = NULL, qval = NULL)
 			}
 		}
 
-		if (RETVAL != -1)
-			RETVAL = append_branch(msg, branch_s.s ? &branch_s : NULL,
-						&msg->dst_uri, &msg->path_vec, q, getb0flags(msg),
-						msg->force_send_socket);
+		if (RETVAL != -1) {
+			memset( &mbranch, 0, sizeof mbranch);
+			mbranch.uri = branch_s.s ? branch_s : *GET_RURI(msg);
+			mbranch.dst_uri = msg->dst_uri;
+			mbranch.path = msg->path_vec;
+			mbranch.q = q;
+			mbranch.bflags = getb0flags(msg);
+			mbranch.force_send_socket = msg->force_send_socket;
+			RETVAL = append_msg_branch( &mbranch );
+		}
 	}
   OUTPUT:
 	RETVAL