SCA: Fix issues with parsing Call-Info in SHM msg

(cherry picked from commit e44b9268c7cdcd31aa2515849f476c6ffa4e4c41)

Author: liviuchircu

modules/presence_callinfo/presence_callinfo.c

@@ -1003,7 +1003,7 @@ mi_response_t *sca_mi_set_log_level(const mi_params_t *params,
 
 static void sca_tm_sendpublish(struct cell *t, int type, struct tmcb_params *_params)
 {
-	struct sip_msg *req = _params->req; //, *rpl = _params->rpl;
+	struct sip_msg *rpl = _params->rpl; //, *req = _params->req;
 	struct sca_cb_params *param;
 	struct sca_party *entity;
 	struct dlg_cell *dlg;
@@ -1056,8 +1056,8 @@ static void sca_tm_sendpublish(struct cell *t, int type, struct tmcb_params *_pa
 
 		if (n) {
 			/* best-effort search for ";appearance-index" in Call-INFO hdr */
-			if (parse_call_info_header(req) == 0)
-				idx = get_appearance_index(req);
+			if (parse_call_info_header(rpl) == 0)
+				idx = get_appearance_index(rpl);
 
 			sca_sendpublish(dlg, branch, &entity->uri, peer, idx, -1);
 		}

modules/presence_callinfo/sca_dialog.c

@@ -107,14 +107,23 @@ void sca_dialog_sendpublish(struct dlg_cell *dlg, int type,
 	if (!msg || msg == FAKED_REPLY) {
 		LM_SCA("null/fake SIP message provided, assuming index 1 (%p)\n", msg);
 		idx = 1;
-	} else if (parse_call_info_header(msg) != 0) {
-		LM_SCA("message has no Call-Info hf, assuming index 1\n");
-		idx = 1;
 	} else {
-		idx = get_appearance_index(msg);
-		if (idx == 0) {
-			LM_SCA("message has Call-Info but index not found, assuming 1\n");
+		struct sip_msg pkg_msg;
+
+		memset(&pkg_msg, 0, sizeof pkg_msg);
+		parse_msg(msg->buf, msg->len, &pkg_msg);
+
+		if (parse_call_info_header(&pkg_msg) != 0) {
+			LM_SCA("message has no Call-Info hf, assuming index 1\n");
 			idx = 1;
+		} else {
+			idx = get_appearance_index(msg);
+			if (idx == 0) {
+				LM_SCA("message has Call-Info but index not found, assuming 1\n");
+				idx = 1;
+			}
+
+			free_call_info(pkg_msg.call_info->parsed);
 		}
 	}