Browse code

modules/{various}: updated because there is now an extra parameter on the append_branch() function

Peter Dunkley authored on 17/05/2013 23:18:43
Showing 12 changed files
... ...
@@ -202,7 +202,7 @@ int alias_db_lookup(struct sip_msg* _msg, str table_s)
202 202
 		} else {
203 203
 			user_s.s = useruri_buf;
204 204
 			if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0,
205
-					  0, 0, 0) == -1)
205
+					  0, 0, 0, 0) == -1)
206 206
 			{
207 207
 				LM_ERR("error while appending branches\n");
208 208
 				goto err_server;
... ...
@@ -999,7 +999,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst,
999 999
 				/* if is not the first modification, push the current uri as
1000 1000
 				 * branch */
1001 1001
 			    if (append_branch( msg, 0, 0, 0, Q_UNSPECIFIED,
1002
-					       0, 0, 0, 0, 0) != 1)
1002
+					       0, 0, 0, 0, 0, 0) != 1)
1003 1003
 				{
1004 1004
 					LM_ERR("append_branch action failed\n");
1005 1005
 					goto error;
... ...
@@ -1026,7 +1026,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst,
1026 1026
 			ruri_mark_new(); /* re-use uri for serial forking */
1027 1027
 		} else if (dst->opd&AVPOPS_USE_BRANCH) {
1028 1028
 			if (append_branch( msg, &val, 0, 0, Q_UNSPECIFIED, 0,
1029
-					   msg->force_send_socket, 0, 0, 0) != 1)
1029
+					   msg->force_send_socket, 0, 0, 0, 0) != 1)
1030 1030
 			{
1031 1031
 				LM_ERR("append_branch action failed\n");
1032 1032
 				goto error;
... ...
@@ -71,7 +71,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq)
71 71
 	getbflagsval(0, &branch_flags);
72 72
 	ret = append_branch(msg, (uri.len>0)?&uri:0, &msg->dst_uri,
73 73
 			    &msg->path_vec, q, branch_flags,
74
-			    msg->force_send_socket, 0, 0, 0);
74
+			    msg->force_send_socket, 0, 0, 0, 0);
75 75
 
76 76
 
77 77
 	if(uri.len<=0)
... ...
@@ -92,7 +92,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs,
92 92
 			(*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags);
93 93
 		if(append_branch(msg, &(*locs)->addr.uri,
94 94
 				 &(*locs)->addr.received, 0,
95
-				 Q_UNSPECIFIED, bflags, 0, 0, 0, 0)==-1){
95
+				 Q_UNSPECIFIED, bflags, 0, 0, 0, 0, 0)==-1){
96 96
 			LM_ERR("failed when appending branch <%s>\n",
97 97
 			       (*locs)->addr.uri.s);
98 98
 			goto error;
... ...
@@ -295,7 +295,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest,
295 295
 
296 296
 	if(is_route_type(FAILURE_ROUTE)
297 297
 			&& (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) {
298
-	    if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0) != 1) {
298
+	    if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) {
299 299
 			LM_ERR("append_branch action failed\n");
300 300
 			return -1;
301 301
 		}
... ...
@@ -142,7 +142,7 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2)
142 142
 	}
143 143
 	return hash_table_lookup(&(_msg->parsed_uri.host), &did, &attrs);
144 144
     } else if (is_route_type(FAILURE_ROUTE)) {
145
-	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0);
145
+	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0, 0);
146 146
 	if (branch.s) {
147 147
 	    if (parse_uri(branch.s, branch.len, &puri) < 0) {
148 148
 		LM_ERR("error while parsing branch URI\n");
... ...
@@ -687,7 +687,7 @@ int do_query(struct sip_msg* _msg, char *user, char *name, str *service) {
687 687
 		q = q - 10;
688 688
 		curr_prio = priority;
689 689
 	    }
690
-	    if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0) == -1) {
690
+	    if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0) == -1) {
691 691
 		goto done;
692 692
 	    }
693 693
 	}
... ...
@@ -1137,7 +1137,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix,
1137 1137
 				q = q - 10;
1138 1138
 				curr_prio = priority;
1139 1139
 			}
1140
-			if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0)
1140
+			if (append_branch(_msg, &result, 0, 0, q, 0, 0, 0, 0, 0, 0)
1141 1141
 			    == -1) {
1142 1142
 				goto done;
1143 1143
 			}
... ...
@@ -168,7 +168,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) {
168 168
 			}
169 169
 		} else {
170 170
 		    if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0,
171
-				      0, 0, 0) == -1) {
171
+				      0, 0, 0, 0) == -1) {
172 172
 				LM_ERR("append_branch failed; too many or too long URIs?\n");
173 173
 				goto error02;
174 174
 			}
... ...
@@ -384,7 +384,7 @@ int I_scscf_select(struct sip_msg* msg, char* str1, char* str2) {
384 384
         } else {
385 385
             /* subsequent */
386 386
             req = msg;
387
-            append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0);
387
+            append_branch(req, &scscf_name, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0);
388 388
             result = CSCF_RETURN_TRUE;
389 389
         }
390 390
     } else {
... ...
@@ -76,7 +76,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) {
76 76
 
77 77
 	/* append branch if last trigger failed */
78 78
 	if (is_route_type(FAILURE_ROUTE))
79
-		append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0);
79
+		append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0);
80 80
 
81 81
 	// Determines the tm transaction identifiers.
82 82
 	// If no transaction, then creates one
... ...
@@ -406,7 +406,7 @@ static int check_routing(struct sip_msg* msg, int idx)
406 406
 	}
407 407
 
408 408
 check_branches:
409
-	for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0))!=0 ;
409
+	for( br_idx=0 ; (branch.s=get_branch(br_idx,&branch.len,&q,0,0,0,0,0,0,0))!=0 ;
410 410
 			br_idx++ ) {
411 411
 		uri_str = get_plain_uri(&branch);
412 412
 		if (!uri_str) {
... ...
@@ -700,7 +700,7 @@ static int xl_get_branch(struct sip_msg *msg, str *res, str *hp, int hi, int hf)
700 700
 
701 701
 
702 702
 	init_branch_iterator();
703
-	branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0);
703
+	branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0, 0, 0, 0);
704 704
 	if (!branch.s) {
705 705
 		return xl_get_null(msg, res, hp, hi, hf);
706 706
 	}
... ...
@@ -731,7 +731,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h
731 731
 	cnt = len = 0;
732 732
 
733 733
 	init_branch_iterator();
734
-	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0)))
734
+	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0)))
735 735
 	{
736 736
 		cnt++;
737 737
 		len += uri.len;
... ...
@@ -756,7 +756,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h
756 756
 	p = local_buf;
757 757
 
758 758
 	init_branch_iterator();
759
-	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0)))
759
+	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0)))
760 760
 	{
761 761
 		if (i)
762 762
 		{