sip-lab 1.12.39 → 1.13.0

package/src/sip.hpp

@@ -1,80 +1,72 @@
 #ifndef __SIP_HPP__
 #define __SIP_HPP__
 
-#include <pjsip.h>
-#include <pjmedia.h>
-#include <pjmedia-codec.h>
-#include <pjsip_ua.h>
-#include <pjsip_simple.h>
 #include <pjlib-util.h>
 #include <pjlib.h>
+#include <pjmedia-codec.h>
+#include <pjmedia.h>
+#include <pjsip.h>
+#include <pjsip_simple.h>
+#include <pjsip_ua.h>
 
 #define FLAG_NO_AUTO_100_TRYING 1
 
 #define CALL_FLAG_DELAYED_MEDIA 1
 
-
 int __pjw_init();
 int __pjw_poll(char *out_evt);
 
-//int pjw_transport_create(const char *sip_ipaddr, int port, pjsip_transport_type_e type, int *out_t_id, int *out_port);
-int pjw_transport_create(const char *json, int *out_t_id, char *out_t_address, int *out_port);
+int pjw_transport_create(const char *json, int *out_t_id, char *out_t_address,
+                         int *out_port);
 
 int pjw_transport_get_info(int t_id, char **out_sip_ipaddr, int *out_port);
 
-//int pjw_account_create(int t_id, const char *domain, const char *server, const char *username, const char *password, const char *additional_headers, const char *c_to_url, int expires, int *out_acc_id);
 int pjw_account_create(int t_id, const char *json, int *out_acc_id);
 
-//int pjw_account_register(long acc_id, pj_bool_t autoreg);
 int pjw_account_register(long acc_id, const char *json);
 
 int pjw_account_unregister(long acc_id);
 
-//int pjw_call_create(long t_id, unsigned flags, const char *from_uri, const char *to_uri, const char *request_uri, const char *proxy_uri, const char *additional_headers, const char *realm, const char *username, const char *password, long *out_call_id, char *out_sip_call_id);
-int pjw_call_create(long t_id, const char *json, long *out_call_id, char *out_sip_call_id);
+int pjw_request_create(long t_id, const char *json, long *out_request_id,
+                       char *out_sip_call_id);
+
+int pjw_request_respond(long request_id, const char *json);
+
+int pjw_call_create(long t_id, const char *json, long *out_call_id,
+                    char *out_sip_call_id);
 
-//int pjw_call_respond(long call_id, int code, const char *reason, const char *additional_headers);
 int pjw_call_respond(long call_id, const char *json);
 
-//int pjw_call_terminate(long call_id, int code, const char *reason, const char *additional_headers);
 int pjw_call_terminate(long call_id, const char *json);
 
-//int pjw_call_send_dtmf(long call_id, const char *digits, int mode);
 int pjw_call_send_dtmf(long call_id, const char *json);
 
-//int pjw_call_reinvite(long call_id, int hold, unsigned flags);
 int pjw_call_reinvite(long call_id, const char *json);
 
-//int pjw_call_send_request(long call_id, const char *method_name, const char *additional_headers, const char *body, const char *ct_type, const char *ct_subtype);
 int pjw_call_send_request(long call_id, const char *json);
 
-//int pjw_call_start_record_wav(long call_id, const char *file);
 int pjw_call_start_record_wav(long call_id, const char *file);
 
-//int pjw_call_start_play_wav(long call_id, const char *file);
 int pjw_call_start_play_wav(long call_id, const char *file);
 
-int pjw_call_stop_play_wav(long call_id);
+int pjw_call_stop_play_wav(long call_id, const char *json);
 
-int pjw_call_stop_record_wav(long call_id);
+int pjw_call_stop_record_wav(long call_id, const char *json);
 
-//int pjw_call_start_fax(long call_id, bool is_sender, const char *file);
 int pjw_call_start_fax(long call_id, const char *json);
 
-int pjw_call_stop_fax(long call_id);
+int pjw_call_stop_fax(long call_id, const char *json);
 
-int pjw_call_get_stream_stat(long call_id, char *out_stats);
+int pjw_call_get_stream_stat(long call_id, const char *json, char *out_stats);
 
-//int pjw_call_refer(long call_id, const char *dest_uri, const char *additional_headers, long *out_subscription_id);
-int pjw_call_refer(long call_id, const char *json, long *out_subscription_id);
+// int pjw_call_refer(long call_id, const char *json, long
+// *out_subscription_id);
 
 int pjw_call_get_info(long call_id, const char *required_info, char *out_info);
 
 int pjw_call_gen_string_replaces(long call_id, char *out_replaces);
 
-int pjw_packetdump_start(const char *dev, const char *file);
-
-int pjw_packetdump_stop();
+int pjw_call_send_tcp_msg(long call_id, const char *json);
 
 int pjw_get_codecs(char *out_codecs);
 
@@ -82,18 +74,15 @@ int pjw_set_codecs(const char *in_codec_info);
 
 int __pjw_shutdown();
 
-//int pjw_notify(long subscriber_id, const char *content_type, const char *body, int subscription_state, const char *reason, const char *additional_headers);
 int pjw_notify(long subscriber_id, const char *json);
 
-//int pjw_notify_xfer(long subscriber_id, int subscription_state, int xfer_status_code, const char *xfer_status_text);
 int pjw_notify_xfer(long subscriber_id, const char *json);
 
 int pjw_register_pkg(const char *event, const char *accept);
 
-//int pjw_subscription_create(long transport_id, const char *event, const char *accept, const char *from_uri, const char *to_uri, const char *request_uri, const char *proxy_uri, const char *realm, const char *username, const char *password, long *out_subscription_id);
-int pjw_subscription_create(long transport_id, const char *json, long *out_subscription_id);
+int pjw_subscription_create(long transport_id, const char *json,
+                            long *out_subscription_id);
 
-//int pjw_subscription_subscribe(long subscription_id, int expires, const char *additional_headers);
 int pjw_subscription_subscribe(long subscription_id, const char *json);
 
 int pjw_log_level(long log_level);
@@ -103,5 +92,8 @@ int pjw_set_flags(unsigned flags);
 int pjw_dtmf_aggregation_on(int inter_digit_timer);
 int pjw_dtmf_aggregation_off();
 
+int pjw_enable_telephone_event();
+int pjw_disable_telephone_event();
+
 char *pjw_get_error();
 #endif

package/src/packetdumper.cpp

@@ -1,234 +0,0 @@
-#include <stdio.h>
-#include <pcap.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/if_ether.h>
-#include <netinet/udp.h>
-
-#include <pthread.h>
-
-#include "packetdumper.hpp"
-
-#include "boost/mem_fn.hpp"
-
-
-#define LOCK() pthread_mutex_lock(&_mutex);
-#define UNLOCK() pthread_mutex_unlock(&_mutex);
-
-PacketDumper::PacketDumper()
-: _handler(0), _dumper(0), _end_flag(false)
-{
-}
-
-PacketDumper::~PacketDumper()
-{ 
-	_end_flag = true;
-	pthread_join(_thread, NULL);
-	//printf("PacketDumper destroyed\n"); 
-}
-
-bool PacketDumper::init(string dev, string file) {
-	if(_handler){ return false; } // already initialized
-
-	char errbuf[PCAP_ERRBUF_SIZE];
-
-	_dev = dev;
-
-	_handler = pcap_open_live(_dev.c_str(), 2000, 0, 0, errbuf);
-	if(!_handler){
-		printf("pcap_open_live(): %s\n", errbuf);
-		return false;
-	}
-
-	this->datalink = pcap_datalink(_handler);
-	//printf("pcap_datalink: %d\n",this->datalink);
-	if(this->datalink != DLT_EN10MB && this->datalink != DLT_LINUX_SLL) {
-		printf("pcap_datalink: unsupported datalink %d\n",this->datalink);
-		return false;
-	}
-
-	if( pcap_setnonblock(_handler, 1, errbuf) == -1){
-		printf("pcap_setnonblock(): %s\n", errbuf);
-		return false;
-	}
-
-	_dumper = pcap_dump_open(_handler, file.c_str());
-	if(!_dumper){
-		printf("pcap_dump_open(): %s\n", pcap_geterr(_handler));
-		return false;
-	}
-
-	bpf_u_int32 mask;
-	bpf_u_int32 net;
-
-	//if(pcap_lookupnet(_dev.c_str(), &net, &mask, errbuf) == -1){
-	if(pcap_lookupnet(_dev.c_str(), &net, &mask, errbuf) < 0){
-		printf("Couldn't get netmask for device %s: %s\n",
-				_dev.c_str(), errbuf);
-		return false;	
-	}
-
-	if( pcap_compile(_handler, &_filter_program, "udp", 0, net) == -1 ) {
-		printf("Failed to compile filter: %s\n", pcap_geterr(_handler));
-		return false;
-	}
-
-	if(pcap_setfilter(_handler, &_filter_program) == -1) {
-		printf("Couldn't install filter: %s\n", pcap_geterr(_handler));
-		pcap_freecode(&_filter_program);
-		return false;
-	}
-
-	pthread_mutex_init(&_mutex, NULL);
-
-	if( pthread_create(&_thread, NULL, &thread_func, (void*)this) ){
-		printf("pthread_create() failed\n");
-		return false;
-	}
-
-	//printf("phread_create ok\n");
-	return true;
-}
-
-bool PacketDumper::add_endpoint(uint32_t ipaddr, uint16_t port){
-	LOCK();
-	ipaddr_map::iterator iter = _awaited_endpoints.find(ipaddr);
-	if( _awaited_endpoints.end() == iter ) {
-		//printf("PacketDumper: adding IP MAP %X\n", ipaddr);
-		port_set ps;
-		ps.insert(port);
-		_awaited_endpoints.insert( make_pair(ipaddr, ps) );
-	} else {
-		iter->second.insert(port);
-	}
-	//printf("PacketDumper: adding port %X:%d\n", ipaddr, port);
-	UNLOCK();
-	return true;
-}
-
-bool PacketDumper::remove_endpoint(uint32_t ipaddr, uint16_t port){
-	bool res = false;
-	LOCK();
-	ipaddr_map::iterator im_iter = _awaited_endpoints.find(ipaddr);
-	if( _awaited_endpoints.end() != im_iter ) {
-		port_set::iterator ps_iter = im_iter->second.find(port);
-		if( im_iter->second.end() != ps_iter ) {
-			im_iter->second.erase(ps_iter);
-			//printf("PacketDumper: Removing port %X:%d\n", ipaddr, port); 
-			res = true;
-		}
-		if(0 == im_iter->second.size()) { 
-			_awaited_endpoints.erase(im_iter);
-			//printf("PacketDumper: Removing IP MAP %X\n", ipaddr);
-		}
-	}
-	UNLOCK();
-	return res;
-}
-
-void PacketDumper::process(){
-	const u_char *packet;
-	pcap_pkthdr hdr;
-	ip_header* ip_h;	
-	udphdr *udp_h;
-
-	packet = pcap_next(_handler, &hdr);
-	if(packet)
-	{
-		bool dumpit;
-		if(DLT_EN10MB == this->datalink) {
-			ip_h = (ip_header*)(packet + sizeof(ether_header));
-			u_int size_ip = IP_HL(ip_h)*4;
-			udp_h = (udphdr*)(packet + sizeof(ether_header) + size_ip);
-		} else {
-			//Linux SLL cooked
-			ip_h = (ip_header*)(packet + sizeof(dlt_linux_sll));
-			u_int size_ip = IP_HL(ip_h)*4;
-			udp_h = (udphdr*)(packet + sizeof(dlt_linux_sll) + size_ip);
-		}
-		
-		
-		//if(ip_h->ip_src == 0xb905adca || ip_h->ip_dst == 0xb905adca) {
-		//	printf("PacketDumper: packet received src=%X:%d dst=%X:%d\n", ip_h->ip_src, udp_h->source, ip_h->ip_dst, udp_h->dest);
-		//}
-
-		ipaddr_map::iterator im_iter;
-
-		//Check packet source
-		im_iter = _awaited_endpoints.find( ip_h->ip_src );
-		if( im_iter != _awaited_endpoints.end() ) {
-			port_set::iterator ps_iter = im_iter->second.find( udp_h->source);
-			if( ps_iter != im_iter->second.end() ) {
-				pcap_dump((u_char*)_dumper, &hdr, packet);
-				if( pcap_dump_flush(_dumper) == -1){
-					printf("pcap_dump_flush() error\n");
-				}
-				return;
-			}
-		}
-
-
-		//Check packet dest
-		im_iter = _awaited_endpoints.find( ip_h->ip_dst );
-		if( im_iter != _awaited_endpoints.end() ) {
-			port_set::iterator ps_iter = im_iter->second.find( udp_h->dest);
-			if( ps_iter != im_iter->second.end() ) {
-				pcap_dump((u_char*)_dumper, &hdr, packet);
-				if( pcap_dump_flush(_dumper) == -1){
-					printf("pcap_dump_flush() error\n");
-				}
-				return;
-			}
-		}
-
-
-	}
-}
-
-static void *thread_func(void *vptr_args){
-	//printf("entering thread_func\n");
-	PacketDumper *t = (PacketDumper*)vptr_args;
-	while(!t->_end_flag){
-		usleep(10);
-		pthread_mutex_lock(&t->_mutex);
-		t->process();
-		pthread_mutex_unlock(&t->_mutex);
-	}
-
-	if(t->_handler){
-		pcap_close(t->_handler);
-	}
-	if(t->_dumper){
-		pcap_dump_close(t->_dumper);
-	}
-	
-	//printf("exiting thread_func\n");
-}
-
-int test() {
-	PacketDumper pd;
-	pd.init("bond1", "x.cap");
-
-	uint32_t ip_host = 0xc0a8581c;
-	uint32_t ip_net = htonl(ip_host);
-	printf("net:%X\n",ip_net);
-	
-	uint16_t port_host = 5060;
-	uint16_t port_net = htons(port_host);
-	printf("net:%X\n",port_net);
-	
-	pd.add_endpoint( inet_addr("192.168.88.2"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.8"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.3"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.28"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.4"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.66"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.64"), htons(5060) );
-	pd.add_endpoint( inet_addr("192.168.88.62"), htons(5060) );
-
-	pd.remove_endpoint( inet_addr("192.168.88.4"), htons(5060) );
-	pd.remove_endpoint( inet_addr("192.168.88.66"), htons(5060) );
-	for(;;) {
-		;
-	}
-}

package/src/packetdumper.hpp

@@ -1,67 +0,0 @@
-#ifndef __TCPDUMPER_H__
-#define __TCPDUMPER_H__
-
-#include <pcap.h>
-
-#include <string>
-#include <pthread.h>
-#include "boost/bind.hpp"
-
-#include <set>
-#include <map>
-
-using namespace std;
-
-class PacketDumper
-{
-public:
-	PacketDumper();
-	~PacketDumper();
-	bool init(string dev, string file);
-	bool add_endpoint(uint32_t ipaddr, uint16_t port);
-	bool remove_endpoint(uint32_t ipaddr, uint16_t port);
-	void process();
-	pthread_mutex_t _mutex;
-	bool _end_flag;
-	string _dev;
-	pcap_t *_handler;
-	pcap_dumper_t *_dumper;	
-private:
-	string _filter;
-	bpf_program _filter_program;
-	pthread_t _thread;
-	int datalink;
-	typedef set<uint16_t> port_set;
-	typedef map <uint32_t, port_set> ipaddr_map;
-	ipaddr_map _awaited_endpoints; 
-};
-
-static void *thread_func(void *vptr_args);
-
-struct dlt_linux_sll {
-	u_short packet_type;
-	u_short ARPHRD;
-	u_short slink_length;
-	u_char bytes[8];
-	u_short ether_type;
-};
-
-struct ip_header {
-	u_char ip_version_headerlength; // version << 4 | header length >> 2
-#define IP_HL(ip)	(((ip)->ip_version_headerlength) & 0x0f)
-#define IP_V(ip)	(((ip)->ip_version_headerlength) >> 4)
-	u_char ip_tos; //Type of service
-	u_short ip_len; // total length
-	u_short ip_id; // identification
-	u_short ip_off; //fragment offset field
-	
-	u_char ip_ttl;
-	u_char ip_p;
-	u_short ip_sum;
-	u_int ip_src;
-	u_int ip_dst;
-};
-
-
-
-#endif