sip-lab 1.30.0 → 1.32.0

package/src/sip.cpp

@@ -614,7 +614,7 @@ void build_local_contact_from_tpfactory(char *dest, pjsip_tpfactory *tpfactory,
 // pj_bool_t add_additional_headers(pj_pool_t *pool, pjsip_tx_data *tdata, const
 // char *additional_headers);
 pj_bool_t add_headers(pj_pool_t *pool, pjsip_tx_data *tdata,
-                      Document &document);
+                      Document &document, pjsip_dialog *dlg);
 
 pj_bool_t add_headers_for_account(pjsip_regc *regc, Document &document);
 
@@ -2361,6 +2361,10 @@ int pjw_call_respond(long call_id, const char *json) {
 
     status = pjsip_dlg_send_response(call->inv->dlg, tsx, tdata);
 
+    if (status != PJ_SUCCESS) {
+       printf("Failed to send response, status=%d\n", status);
+    }
+
     assert(status == PJ_SUCCESS);
 
     if (code >= 200) {
@@ -2423,11 +2427,9 @@ int pjw_call_respond(long call_id, const char *json) {
       }
       call->pending_rdata = 0;
 
-      if (code >= 200 && code < 300) {
-        call->pending_request = -1;
+      call->pending_request = -1;
 
-        pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
-      }
+      pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
     }
   } else {
     status = pjsip_inv_answer(call->inv, code, &r,
@@ -2448,15 +2450,26 @@ int pjw_call_respond(long call_id, const char *json) {
         call->pending_rdata = 0;
       }
 
-      if (code >= 200 && code < 300) {
-        call->pending_request = -1;
+      call->pending_request = -1;
+
+      /*
+      int printed;
+      char buf[2048];
+      printed = pjsip_msg_print(tdata->msg, buf, sizeof(buf));
+      printf("tdata before len=%i :\n%s\n", printed, buf);
+      */
 
-        pjsip_msg *msg = tdata->msg;
-        pjsip_msg_find_remove_hdr(msg, PJSIP_H_SUPPORTED, NULL);
-      }
+      // the below works (header Supported is removed) 
+      // but something (the 100rel module) adds 'Supported: 100rel' later.
+      pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
+
+      /*
+      printed = pjsip_msg_print(tdata->msg, buf, sizeof(buf));
+      printf("tdata after len=%i :\n%s\n", printed, buf);
+      */
     }
 
-    if (!add_headers(call->inv->dlg->pool, tdata, document)) {
+    if (!add_headers(call->inv->dlg->pool, tdata, document, NULL)) {
       goto out;
     }
   }
@@ -2537,7 +2550,7 @@ int pjw_call_terminate(long call_id, const char *json) {
     goto out;
   }
 
-  if (!add_headers(call->inv->dlg->pool, tdata, document)) {
+  if (!add_headers(call->inv->dlg->pool, tdata, document, NULL)) {
     goto out;
   }
 
@@ -2674,7 +2687,7 @@ int pjw_request_create(long t_id, const char *json, long *out_request_id,
     goto out;
   }
 
-  if (!add_headers(tdata->pool, tdata, document)) {
+  if (!add_headers(tdata->pool, tdata, document, NULL)) {
     goto out;
   }
 
@@ -2774,7 +2787,7 @@ int pjw_request_respond(long request_id, const char *json) {
     goto out;
   }
 
-  if (!add_headers(tdata->pool, tdata, document)) {
+  if (!add_headers(tdata->pool, tdata, document, NULL)) {
     goto out;
   }
 
@@ -2843,7 +2856,7 @@ int pjw_call_create(long t_id, const char *json, long *out_call_id,
 
   const char *valid_params[] = {"from_uri",  "to_uri", "request_uri",
                                 "proxy_uri", "auth",   "delayed_media",
-                                "headers",   "media",  ""};
+                                "headers",   "media",  "from_tag", ""};
 
   if (!g_transport_ids.get(t_id, val)) {
     set_error("Invalid transport_id");
@@ -3244,7 +3257,22 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
     return -1;
   }
 
-  if (!add_headers(dlg->pool, tdata, document)) {
+  if (document.HasMember("from_tag")) {
+    if (!document["from_tag"].IsString()) {
+      g_call_ids.remove(call_id, (long&)call);
+      close_media(call);
+      status = pjsip_dlg_terminate(dlg); // ToDo:
+      set_error("Parameter from_tag must be a string");
+      return -1;
+    }
+
+    char *from_tag = (char *)document["from_tag"].GetString();
+
+    pjsip_from_hdr *from_hdr = (pjsip_from_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_FROM, NULL);
+    pj_strdup2(tdata->pool, &from_hdr->tag, from_tag);
+  }
+
+  if (!add_headers(dlg->pool, tdata, document, dlg)) {
     g_call_ids.remove(call_id, (long&)call);
     close_media(call);                 // Todo:
     status = pjsip_dlg_terminate(dlg); // ToDo:
@@ -3783,6 +3811,74 @@ out:
   return 0;
 }
 
+
+int pjw_call_update(long call_id, const char *json) {
+  addon_log(L_DBG, "pjw_call_update call_id=%d\n", call_id);
+
+  PJW_LOCK();
+  clear_error();
+
+  unsigned flags = 0;
+
+  long val;
+  Call *call;
+  pjsip_inv_session *inv;
+
+  pj_status_t status;
+
+  pjsip_tx_data *tdata;
+  // pjmedia_sdp_session *sdp = 0;
+
+  char buffer[MAX_JSON_INPUT];
+
+  Document document;
+
+  const char *valid_params[] = {"headers", ""};
+
+  if (!g_call_ids.get(call_id, val)) {
+    set_error("Invalid call_id");
+    goto out;
+  }
+  call = (Call *)val;
+
+  inv = call->inv;
+
+  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
+    goto out;
+  }
+
+  if (!validate_params(document, valid_params)) {
+    goto out;
+  }
+
+  status = pjsip_inv_update(call->inv, NULL, NULL, &tdata);
+  printf("status=%d\n", status);
+  if (status != PJ_SUCCESS) {
+    set_error("pjsip_inv_update failed");
+    goto out;
+  }
+
+  pjsip_msg_find_remove_hdr(tdata->msg, PJSIP_H_SUPPORTED, NULL);
+
+  if (!add_headers(call->inv->dlg->pool, tdata, document, NULL)) {
+    goto out;
+  }
+
+  status = pjsip_inv_send_msg(call->inv, tdata);
+  if (status != PJ_SUCCESS) {
+    set_error("pjsip_inv_send_msg failed");
+    goto out;
+  }
+
+out:
+  PJW_UNLOCK();
+  if (pjw_errorstring[0]) {
+    return -1;
+  }
+
+  return 0;
+}
+
 // To send INFO and other requests inside dialog
 int pjw_call_send_request(long call_id, const char *json) {
   PJW_LOCK();
@@ -3869,7 +3965,7 @@ int pjw_call_send_request(long call_id, const char *json) {
     goto out;
   }
 
-  if (!add_headers(call->inv->dlg->pool, tdata, document)) {
+  if (!add_headers(call->inv->dlg->pool, tdata, document, NULL)) {
     goto out;
   }
 
@@ -6545,120 +6641,126 @@ int pjw_enable_telephone_event() {
 	return 0;
 }
 
-int __pjw_shutdown() {
-  // addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
-  PJW_LOCK();
-
-  g_shutting_down = true;
-
-  // disable auto cleanup
-
-  /*
-      map<long, long>::iterator iter;
-      iter = g_call_ids.id_map.begin();
-      while(iter != g_call_ids.id_map.end()){
-              Call *call = (Call*)iter->second;
-
-              addon_log(L_DBG, "Terminating call %d\n", iter->first);
-
-              pjsip_tx_data *tdata;
-              pj_status_t status;
-              status = pjsip_inv_end_session(call->inv,
-                                                603,
-                                                NULL,
-                                                &tdata); //Copied from pjsua
-              if(status != PJ_SUCCESS){
-                      //ignore
-                      char err[256];
-                      pj_strerror(status, err, sizeof(err));
-                      addon_log(L_DBG, "pjsip_inv_end_session failed statut=%i
-     (%s)\n", status, err);
-                      ++iter;
-                      continue;
-              }
-
-              if(!tdata)
-              {
-                      //if tdata was not set by pjsip_inv_end_session, it means
-     we didn't receive any response yet (100 Trying) and we cannot send CANCEL
-     in this situation. So we just can return here without calling
-     pjsip_inv_send_msg.
-                      ++iter;
-                      addon_log(L_DBG, "no tdata\n");
-                      continue;
-              }
-
-              status = pjsip_inv_send_msg(call->inv, tdata);
-              if(status != PJ_SUCCESS){
-                      addon_log(L_DBG, "pjsip_inv_send_msg failed\n");
-              }
-              ++iter;
-      }
-
-      iter = g_account_ids.id_map.begin();
-      while(iter != g_account_ids.id_map.end()){
-              pjsip_regc *regc = (pjsip_regc*)iter->second;
-
-              addon_log(L_DBG, "Unregistering account %d\n", iter->first);
-
-              pjsip_tx_data *tdata;
-              pj_status_t status;
-
-              status = pjsip_regc_unregister(regc, &tdata);
-              if(status != PJ_SUCCESS)
-              {
-                      addon_log(L_DBG, "pjsip_regc_unregister failed\n");
-              }
+int __pjw_shutdown(int clean_up) {
+	addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
 
-              status = pjsip_regc_send(regc, tdata);
-              if(status != PJ_SUCCESS)
-              {
-                      addon_log(L_DBG, "pjsip_regc_send failed\n");
-              }
-              ++iter;
-      }
-
-      Subscription *subscription;
-      iter = g_subscription_ids.id_map.begin();
-      while(iter != g_subscription_ids.id_map.end()){
-              addon_log(L_DBG, "Unsubscribing subscription %d\n", iter->first);
-
-              subscription = (Subscription*)iter->second;
-              if(!subscription_subscribe(subscription, 0, NULL)) {
-                      addon_log(L_DBG, "Unsubscription failed failed\n");
-              }
-              ++iter;
-      }
+	g_shutting_down = true;
 
-      PJW_UNLOCK();
-
-      //uint32_t wait = 100000 * (g_call_ids.id_map.size() +
-     g_account_ids.id_map.size()));
-      //wait += 1000000; //Wait one whole second to permit packet capture to get
-     any final packets
-
-      timeval tv_start;
-      timeval tv_end;
-      gettimeofday(&tv_start, NULL);
-      gettimeofday(&tv_end, NULL);
+    if(!clean_up) {
+      return 0;
+    }
 
-      unsigned int start = tv_start.tv_sec * 1000 + (tv_start.tv_usec / 1000);
-      unsigned int end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+	addon_log(L_DBG, "INITIATING CLEANUP\n");
 
-      int DELAY = 2000; // 1000 ms delay
-      while(end - start < DELAY) {
-              pj_time_val tv = {0, 500};
-              pj_status_t status;
-              status = pjsip_endpt_handle_events(g_sip_endpt, &tv);
+	PJW_LOCK();
 
-              gettimeofday(&tv_end, NULL);
-              end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
-              //time(&end);
-      }
+	map<long, long>::iterator iter;
+	iter = g_call_ids.id_map.begin();
+	while(iter != g_call_ids.id_map.end()){
+		Call *call = (Call*)iter->second;
+
+		addon_log(L_DBG, "Terminating call %d\n", iter->first);
+
+		pjsip_tx_data *tdata;
+		pj_status_t status;
+		status = pjsip_inv_end_session(call->inv,
+						  603,
+						  NULL, 
+						  &tdata); //Copied from pjsua
+		if(status != PJ_SUCCESS){
+			//ignore 
+			char err[256];
+			pj_strerror(status, err, sizeof(err));
+			addon_log(L_DBG, "pjsip_inv_end_session failed statut=%i (%s)\n", status, err);
+			++iter;
+			continue;
+		}
+
+		if(!tdata)
+		{
+			//if tdata was not set by pjsip_inv_end_session, it means we didn't receive any response yet (100 Trying) and we cannot send CANCEL in this situation. So we just can return here without calling pjsip_inv_send_msg.
+			++iter;
+			addon_log(L_DBG, "no tdata\n");
+			continue;
+		}
+
+		status = pjsip_inv_send_msg(call->inv, tdata);
+		if(status != PJ_SUCCESS){
+			addon_log(L_DBG, "pjsip_inv_send_msg failed\n");
+		}
+		++iter;
+	}
+
+	iter = g_account_ids.id_map.begin();
+	while(iter != g_account_ids.id_map.end()){
+		pjsip_regc *regc = (pjsip_regc*)iter->second;
+
+		addon_log(L_DBG, "Unregistering account %d\n", iter->first);
+
+		pjsip_tx_data *tdata;
+		pj_status_t status;
+
+		status = pjsip_regc_unregister(regc, &tdata);
+		if(status != PJ_SUCCESS)
+		{
+			addon_log(L_DBG, "pjsip_regc_unregister failed\n");
+		}
+
+		status = pjsip_regc_send(regc, tdata);
+		if(status != PJ_SUCCESS)
+		{
+			addon_log(L_DBG, "pjsip_regc_send failed\n");
+		}
+		++iter;
+	}
+
+	Subscription *subscription;
+	iter = g_subscription_ids.id_map.begin();
+
+    rapidjson::Document doc;
+    doc.Parse("{\"expires\": 0}");
+
+	while(iter != g_subscription_ids.id_map.end()){
+		addon_log(L_DBG, "Unsubscribing subscription %d\n", iter->first);
+
+		subscription = (Subscription*)iter->second;	
+		if(!subscription_subscribe(subscription, 0, doc)) {
+			addon_log(L_DBG, "Unsubscription failed failed\n");
+		}
+		++iter;
+	}
 
-  */
+	PJW_UNLOCK();
 
-  return 0;
+	//uint32_t wait = 100000 * (g_call_ids.id_map.size() + g_account_ids.id_map.size()));
+	//wait += 1000000; //Wait one whole second to permit packet capture to get any final packets
+
+	/*
+	time_t end,start;
+	time(&start);
+	end = start;
+	*/
+	timeval tv_start;
+	timeval tv_end;
+	gettimeofday(&tv_start, NULL);
+	gettimeofday(&tv_end, NULL);
+
+	unsigned int start = tv_start.tv_sec * 1000 + (tv_start.tv_usec / 1000);
+	unsigned int end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+
+	int DELAY = 1000; // 1000 ms delay
+	while(end - start < DELAY) {
+		pj_time_val tv = {0, 500}; 
+		pj_status_t status;
+		status = pjsip_endpt_handle_events(g_sip_endpt, &tv);
+
+		gettimeofday(&tv_end, NULL);
+		end = tv_end.tv_sec * 1000 + (tv_end.tv_usec / 1000);
+		//time(&end);
+	}
+
+    addon_log(L_DBG, "CLEANUP DONE\n");
+	return 0;
 }
 
 // Copied from streamutil.c (pjsip sample)
@@ -8267,7 +8369,7 @@ bool notify(pjsip_evsub *evsub, const char *content_type, const char *body,
   }
   s_content_type_subtype = pj_str(tok);
 
-  if (!add_headers(tdata->pool, tdata, document)) {
+  if (!add_headers(tdata->pool, tdata, document, NULL)) {
     return false;
   }
 
@@ -8444,7 +8546,7 @@ out:
 }
 
 pj_bool_t add_headers(pj_pool_t *pool, pjsip_tx_data *tdata,
-                      Document &document) {
+                      Document &document, pjsip_dialog *dlg) {
   if (!document.HasMember("headers")) {
     return PJ_TRUE;
   }
@@ -8464,24 +8566,34 @@ pj_bool_t add_headers(pj_pool_t *pool, pjsip_tx_data *tdata,
     }
     printf("%s => '%s'\n", itr->name.GetString(), itr->value.GetString());
 
-    const char *name = itr->name.GetString();
-    if (!itr->value.IsString()) {
-      set_error("Parameter headers key '%s' found with non-string value", name);
-      return PJ_FALSE;
-    }
+    if(stricmp(itr->name.GetString(), "call-id") == 0) {
+      printf("Setting INVIITE call_id->id to %s\n", itr->value.GetString());
+      pjsip_cid_hdr *call_id_hdr = (pjsip_cid_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CALL_ID, NULL);
+      pj_strdup2(tdata->pool, &call_id_hdr->id, itr->value.GetString());
+      if(dlg) {
+        printf("Setting DLG call_id->id to %s\n", itr->value.GetString());
+        pj_strdup2(dlg->pool, &dlg->call_id->id, itr->value.GetString());
+      }
+    } else {
+      const char *name = itr->name.GetString();
+      if (!itr->value.IsString()) {
+        set_error("Parameter headers key '%s' found with non-string value", name);
+        return PJ_FALSE;
+      }
 
-    const char *value = itr->value.GetString();
+      const char *value = itr->value.GetString();
 
-    pj_str_t hname = pj_str((char *)name);
-    pjsip_hdr *hdr = (pjsip_hdr *)pjsip_parse_hdr(pool, &hname, (char *)value,
-                                                  strlen(value), NULL);
+      pj_str_t hname = pj_str((char *)name);
+      pjsip_hdr *hdr = (pjsip_hdr *)pjsip_parse_hdr(pool, &hname, (char *)value,
+                                                      strlen(value), NULL);
 
-    if (!hdr) {
-      set_error("Failed to parse header '%s' => '%s'", name, value);
-      return PJ_FALSE;
+      if (!hdr) {
+        set_error("Failed to parse header '%s' => '%s'", name, value);
+        return PJ_FALSE;
+      }
+      pjsip_hdr *clone_hdr = (pjsip_hdr *)pjsip_hdr_clone(pool, hdr);
+      pjsip_msg_add_hdr(tdata->msg, clone_hdr);
     }
-    pjsip_hdr *clone_hdr = (pjsip_hdr *)pjsip_hdr_clone(pool, hdr);
-    pjsip_msg_add_hdr(tdata->msg, clone_hdr);
   }
   return PJ_TRUE;
 }
@@ -8828,7 +8940,7 @@ bool subscription_subscribe(Subscription *s, int expires, Document &document) {
     return false;
   }
 
-  if (!add_headers(s->dlg->pool, tdata, document)) {
+  if (!add_headers(s->dlg->pool, tdata, document, NULL)) {
     return false;
   }
 

package/src/sip.hpp

@@ -45,6 +45,8 @@ int pjw_call_send_bfsk(long call_id, const char *json);
 
 int pjw_call_reinvite(long call_id, const char *json);
 
+int pjw_call_update(long call_id, const char *json);
+
 int pjw_call_send_request(long call_id, const char *json);
 
 int pjw_call_start_record_wav(long call_id, const char *file);
@@ -90,7 +92,7 @@ int pjw_get_codecs(char *out_codecs);
 
 int pjw_set_codecs(const char *in_codec_info);
 
-int __pjw_shutdown();
+int __pjw_shutdown(int clean_up);
 
 int pjw_notify(long subscriber_id, const char *json);