sip-lab 1.12.39 → 1.13.1

package/src/event_templates.cpp

@@ -1,62 +1,111 @@
 #include <stdio.h>
 #include <string.h>
 
-int make_evt_incoming_call(char *dest, int size, long transport_id, long call_id, int sip_msg_len, const char *sip_msg) {
-	return snprintf(dest, size, "{\"event\": \"incoming_call\", \"transport_id\": %ld, \"call_id\": %ld}\n%.*s", transport_id, call_id, sip_msg_len, sip_msg);
+int make_evt_incoming_call(char *dest, int size, long transport_id,
+                           long call_id, int sip_msg_len, const char *sip_msg) {
+  return snprintf(dest, size,
+                  "{\"event\": \"incoming_call\", \"transport_id\": %ld, "
+                  "\"call_id\": %ld}\n%.*s",
+                  transport_id, call_id, sip_msg_len, sip_msg);
 }
 
-int make_evt_request(char *dest, int size, const char *entity_type, long id, int sip_msg_len, const char *sip_msg) {
-	return snprintf(dest, size, "{\"event\": \"request\", \"%s_id\": %ld}\n%.*s", entity_type, id, sip_msg_len, sip_msg);
+int make_evt_request(char *dest, int size, const char *entity_type, long id,
+                     int sip_msg_len, const char *sip_msg) {
+  return snprintf(dest, size, "{\"event\": \"request\", \"%s_id\": %ld}\n%.*s",
+                  entity_type, id, sip_msg_len, sip_msg);
 }
 
-int make_evt_response(char *dest, int size, const char *entity_type, long id, int mname_len, const char *mname, int sip_msg_len, const char *sip_msg) {
-	return snprintf(dest, size, "{\"event\": \"response\", \"%s_id\": %ld, \"method\": \"%.*s\"}\n%.*s", entity_type, id, mname_len, mname, sip_msg_len, sip_msg);
+int make_evt_response(char *dest, int size, const char *entity_type, long id,
+                      int mname_len, const char *mname, int sip_msg_len,
+                      const char *sip_msg) {
+  return snprintf(
+      dest, size,
+      "{\"event\": \"response\", \"%s_id\": %ld, \"method\": \"%.*s\"}\n%.*s",
+      entity_type, id, mname_len, mname, sip_msg_len, sip_msg);
 }
 
-int make_evt_media_status(char *dest, int size, long call_id, const char *status, const char *local_mode, const char *remote_mode) {
-	if(strcmp(status, "setup_ok") == 0) {
-		return snprintf(dest, size, "{\"event\": \"media_status\", \"call_id\": %ld, \"status\": \"%s\", \"local_mode\": \"%s\", \"remote_mode\": \"%s\"}", call_id, status, local_mode, remote_mode);
-	} else {
-		return snprintf(dest, size, "{\"event\": \"media_status\", \"call_id\": %ld, \"status\": \"%s\"}", call_id, status);
-	}
+int make_evt_media_update(char *dest, int size, long call_id,
+                          const char *status, const char *media) {
+  if (strcmp(status, "ok") == 0) {
+    return snprintf(dest, size,
+                    "{\"event\": \"media_update\", \"call_id\": %ld, "
+                    "\"status\": \"%s\", \"media\": %s}",
+                    call_id, status, media);
+  } else {
+    return snprintf(
+        dest, size,
+        "{\"event\": \"media_update\", \"call_id\": %ld, \"status\": \"%s\"}",
+        call_id, status);
+  }
 }
 
-int make_evt_dtmf(char *dest, int size, long call_id, int digits_len, const char *digits, int mode) {
-	return snprintf(dest, size, "{\"event\": \"dtmf\", \"call_id\": %ld, \"digits\": \"%.*s\", \"mode\": %i}", call_id, digits_len, digits, mode);
+int make_evt_dtmf(char *dest, int size, long call_id, int digits_len,
+                  const char *digits, int mode, int media_id) {
+  return snprintf(dest, size,
+                  "{\"event\": \"dtmf\", \"call_id\": %ld, \"digits\": "
+                  "\"%.*s\", \"mode\": %i, \"media_id\": %i}",
+                  call_id, digits_len, digits, mode, media_id);
 }
 
-int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len, const char *sip_msg) {
-	printf("sip_msg_len=%i sip_msg=%x\n", sip_msg_len, sip_msg);
-    if(!sip_msg || sip_msg == (char*)0xc000000000000) {
-        // received invalid pointer to sip_msg so do not add the message to the event
-		return snprintf(dest, size, "{\"event\": \"call_ended\", \"call_id\": %ld}", call_id); 
-    } else if(sip_msg_len > 500 && sip_msg_len < 2000 && sip_msg) {
-		/* sip_msg_len sometimes show up as a large value like sip_msg_len=11560297 which seems to be a bug in pjsip */
-		return snprintf(dest, size, "{\"event\": \"call_ended\", \"call_id\": %ld}\n%.*s", call_id, sip_msg_len, sip_msg); 
-	} else {
-		return snprintf(dest, size, "{\"event\": \"call_ended\", \"call_id\": %ld}", call_id); 
-	}
+int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len,
+                        const char *sip_msg) {
+  printf("make_evt_call_ended sip_msg_len=%i sip_msg=%x\n", sip_msg_len,
+         sip_msg);
+  if (!sip_msg || sip_msg == (char *)0xc000000000000) {
+    // received invalid pointer to sip_msg so do not add the message to the
+    // event
+    return snprintf(dest, size, "{\"event\": \"call_ended\", \"call_id\": %ld}",
+                    call_id);
+  } else if (sip_msg_len > 500 && sip_msg_len < 2000 && sip_msg) {
+    /* sip_msg_len sometimes show up as a large value like sip_msg_len=11560297
+     * which seems to be a bug in pjsip */
+    return snprintf(dest, size,
+                    "{\"event\": \"call_ended\", \"call_id\": %ld}\n%.*s",
+                    call_id, sip_msg_len, sip_msg);
+  } else {
+    return snprintf(dest, size, "{\"event\": \"call_ended\", \"call_id\": %ld}",
+                    call_id);
+  }
 }
 
-int make_evt_non_dialog_request(char *dest, int size, int sip_msg_len, const char *sip_msg) {
-	return snprintf(dest, size, "{\"event\": \"non_dialog_request\"}\n%.*s", sip_msg_len, sip_msg);
+int make_evt_non_dialog_request(char *dest, int size, long transport_id,
+                                long request_id, int sip_msg_len,
+                                const char *sip_msg) {
+  return snprintf(dest, size,
+                  "{\"event\": \"non_dialog_request\", \"request_id\": %i, "
+                  "\"transport_id\": %i}\n%.*s",
+                  request_id, transport_id, sip_msg_len, sip_msg);
 }
 
 int make_evt_internal_error(char *dest, int size, const char *msg) {
-	return snprintf(dest, size, "{\"event\": \"internal_error\", \"error\": \"%s\"}", msg);
+  return snprintf(dest, size,
+                  "{\"event\": \"internal_error\", \"error\": \"%s\"}", msg);
 }
 
-/*
-int make_evt_reinvite(char *dest, int size, long call_id, const char *type) {
-	return snprintf(dest, size, "{\"event\": \"reinvite\", \"call_id\": %ld, \"type\": \"%s\"}", call_id, type); 
+int make_evt_reinvite(char *dest, int size, long call_id, int sip_msg_len,
+                      char *sip_msg) {
+  return snprintf(dest, size,
+                  "{\"event\": \"reinvite\", \"call_id\": %i}\n%.*s", call_id,
+                  sip_msg_len, sip_msg);
 }
-*/
 
-int make_evt_registration_status(char *dest, int size, long account_id, int code, const char *reason, int expires) {
-	return snprintf(dest, size, "{\"event\": \"registration_status\", \"account_id\": %ld, \"code\": %i, \"reason\": \"%s\", \"expires\": %i}", account_id, code, reason, expires);
+int make_evt_registration_status(char *dest, int size, long account_id,
+                                 int code, const char *reason, int expires) {
+  return snprintf(dest, size,
+                  "{\"event\": \"registration_status\", \"account_id\": %ld, "
+                  "\"code\": %i, \"reason\": \"%s\", \"expires\": %i}",
+                  account_id, code, reason, expires);
 }
 
 int make_evt_fax_result(char *dest, int size, long call_id, int result) {
-   return snprintf(dest, size, "{\"event\": \"fax_result\", \"call_id\": %ld, \"result\": %i}", call_id, result);
+  return snprintf(
+      dest, size,
+      "{\"event\": \"fax_result\", \"call_id\": %ld, \"result\": %i}", call_id,
+      result);
 }
 
+int make_evt_tcp_msg(char *dest, int size, long call_id, const char *protocol, char *data, int data_len) {
+  return snprintf(
+      dest, size,
+      "{\"event\": \"%s_msg\", \"call_id\": %ld}\n%.*s", protocol, call_id, data_len, data);
+}

package/src/event_templates.hpp

@@ -1,29 +1,39 @@
 #ifndef __EVENT_TEMPLATES__
 #define __EVENT_TEMPLATES__
 
+int make_evt_incoming_call(char *dest, int size, long transport_id,
+                           long call_id, int sip_msg_len, const char *sip_msg);
 
-int make_evt_incoming_call(char *dest, int size, long transport_id, long call_id, int sip_msg_len, const char *sip_msg);
+int make_evt_request(char *dest, int size, const char *entity_type, long id,
+                     int sip_msg_len, const char *sip_msg);
 
-int make_evt_request(char *dest, int size, const char *entity_type, long id, int sip_msg_len, const char *sip_msg);
+int make_evt_response(char *dest, int size, const char *entity_type, long id,
+                      int mname_len, const char *mname, int sip_msg_len,
+                      const char *sip_msg);
 
-int make_evt_response(char *dest, int size, const char *entity_type, long id, int mname_len, const char *mname, int sip_msg_len, const char *sip_msg);
+int make_evt_media_update(char *dest, int size, long call_id,
+                          const char *status, const char *media);
 
-int make_evt_media_status(char *dest, int size, long call_id, const char *status, const char *local_media_mode, const char *remote_media_mode);
+int make_evt_dtmf(char *dest, int size, long call_id, int digits_len,
+                  const char *digits, int mode, int media_id);
 
-int make_evt_dtmf(char *dest, int size, long call_id, int digits_len, const char *digits, int mode);
+int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len,
+                        const char *sip_msg);
 
-int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len, const char *sip_msg);
-
-int make_evt_non_dialog_request(char *dest, int size, int sip_msg_len, const char *sip_msg);
+int make_evt_non_dialog_request(char *dest, int size, long transport_id,
+                                long request_id, int sip_msg_len,
+                                const char *sip_msg);
 
 int make_evt_internal_error(char *dest, int size, const char *msg);
 
-//int make_evt_reinvite(char *dest, int size, long call_id, const char *type);
+int make_evt_reinvite(char *dest, int size, long call_id, int sip_msg_len,
+                      char *sip_msg);
 
-int make_evt_registration_status(char *dest, int size, long account_id, int code, const char *reason, int expires);
+int make_evt_registration_status(char *dest, int size, long account_id,
+                                 int code, const char *reason, int expires);
 
 int make_evt_fax_result(char *dest, int size, long call_id, int result);
 
-#endif
-
+int make_evt_tcp_msg(char *dest, int size, long call_id, const char *protocol, char *data, int data_len);
 
+#endif

package/src/idmanager.cpp

@@ -1,76 +1,77 @@
 #include "idmanager.hpp"
 
-IdManager::IdManager(long max)
-: ids(max) {
-	for(long i=0; i<max ;++i) ids.push_back(i);
+IdManager::IdManager(long max) : ids(max) {
+  for (long i = 0; i < max; ++i)
+    ids.push_back(i);
 };
 
-IdManager::~IdManager() {};
+IdManager::~IdManager(){};
 
-bool IdManager::add(long val, long &id){
-	if(ids.empty()) return false;
+bool IdManager::add(long val, long &id) {
+  if (ids.empty())
+    return false;
 
-	long new_id = ids[0];
-	ids.pop_front();
+  long new_id = ids[0];
+  ids.pop_front();
 
-	id_map[new_id] = val;
-	id = new_id;
-	return true;
+  id_map[new_id] = val;
+  id = new_id;
+  return true;
 }
 
-bool IdManager::remove(long id, long &val){
-	map<long,long>::iterator pos = id_map.begin();
-	while(pos != id_map.end()){
-		if(pos->first == id){
-			val = pos->second;
-			ids.push_back(id);
-			id_map.erase(pos);
-			return true;
-		}
-		++pos;
-	}
-	return false;
+bool IdManager::remove(long id, long &val) {
+  map<long, long>::iterator pos = id_map.begin();
+  while (pos != id_map.end()) {
+    if (pos->first == id) {
+      val = pos->second;
+      ids.push_back(id);
+      id_map.erase(pos);
+      return true;
+    }
+    ++pos;
+  }
+  return false;
 }
 
-bool IdManager::remove_by_val(long val, long &id){
-	map<long,long>::iterator pos = id_map.begin();
-	while(pos != id_map.end()){
-		if(pos->second == val){
-			id = pos->first;
-			ids.push_back(id);
-			id_map.erase(pos);
-			return true;
-		}
-		++pos;
-	}
-	return false;
+bool IdManager::remove_by_val(long val, long &id) {
+  map<long, long>::iterator pos = id_map.begin();
+  while (pos != id_map.end()) {
+    if (pos->second == val) {
+      id = pos->first;
+      ids.push_back(id);
+      id_map.erase(pos);
+      return true;
+    }
+    ++pos;
+  }
+  return false;
 }
 
-bool IdManager::get(long id, long &val){
-	map<long,long>::iterator pos = id_map.find(id);
-	if(pos == id_map.end()) return false;
+bool IdManager::get(long id, long &val) {
+  map<long, long>::iterator pos = id_map.find(id);
+  if (pos == id_map.end())
+    return false;
 
-	val = pos->second;
-	return true;
+  val = pos->second;
+  return true;
 }
 
-bool IdManager::get_id(long val, long &id){
-	map<long,long>::iterator pos = id_map.begin();
-	while(pos != id_map.end()){
-		if(pos->second == val){
-			id = pos->first;
-			return true;
-		}
-		++pos;
-	}
-	return false;
+bool IdManager::get_id(long val, long &id) {
+  map<long, long>::iterator pos = id_map.begin();
+  while (pos != id_map.end()) {
+    if (pos->second == val) {
+      id = pos->first;
+      return true;
+    }
+    ++pos;
+  }
+  return false;
 }
 
-void IdManager::iterate( void (*f)(long id, long val) ){
-	map<long,long>::iterator pos = id_map.begin();
-	while(pos != id_map.end()){
-		f(pos->first, pos->second);
-		++pos;
-	}
+void IdManager::iterate(void (*f)(long id, long val)) {
+  map<long, long>::iterator pos = id_map.begin();
+  while (pos != id_map.end()) {
+    f(pos->first, pos->second);
+    ++pos;
+  }
 }
-

package/src/idmanager.hpp

@@ -9,18 +9,18 @@ using namespace std;
 
 class IdManager {
 public:
-	IdManager(long max);
-	~IdManager();
-	bool add(long val, long &id);
-	bool remove(long id, long &val);
-	bool remove_by_val(long val, long &id);
-	bool get(long id, long &val);
-	bool get_id(long val, long &id);
-	void iterate( void (*f)(long id, long val) );
+  IdManager(long max);
+  ~IdManager();
+  bool add(long val, long &id);
+  bool remove(long id, long &val);
+  bool remove_by_val(long val, long &id);
+  bool get(long id, long &val);
+  bool get_id(long val, long &id);
+  void iterate(void (*f)(long id, long val));
 
-	map<long, long> id_map; //hack to test tcpdumper
+  map<long, long> id_map; // hack to test tcpdumper
 private:
-	boost::circular_buffer<long> ids;
+  boost::circular_buffer<long> ids;
 };
 
 #endif

package/src/log.cpp

@@ -2,17 +2,15 @@
 #include <stdio.h>
 
 void _addon_log(int level, const char *fmt, ...) {
-    va_list args;
+  va_list args;
 
-    /* Check if the message should be logged */
-    if (level > _log_level)
-        return;
+  /* Check if the message should be logged */
+  if (level > _log_level)
+    return;
 
-    va_start(args, fmt);
-    flockfile(stdout);
-    vprintf(fmt, args);
-    funlockfile(stdout);
-    va_end(args);
+  va_start(args, fmt);
+  flockfile(stdout);
+  vprintf(fmt, args);
+  funlockfile(stdout);
+  va_end(args);
 }
-
-

package/src/log.hpp

@@ -3,13 +3,13 @@
 
 #include <stdarg.h>
 
-#define LOG_LEVEL_INFO 0
-#define LOG_LEVEL_DEBUG 1
+#define LL_INFO 0
+#define L_DBG 1
 
-static int _log_level = LOG_LEVEL_DEBUG;
+static int _log_level = L_DBG;
 
 void _addon_log(int level, const char *fmt, ...);
 
-#define addon_log(level, fmt, ...) _addon_log(level, fmt"\n", ##__VA_ARGS__)
+#define addon_log(level, fmt, ...) _addon_log(level, fmt "\n", ##__VA_ARGS__)
 
 #endif