1 files changed, 927 insertions, 88 deletions
diff --git a/Protocols/SIP/SIPProto.cpp b/Protocols/SIP/SIPProto.cpp
index 6485348..85e8515 100644
--- a/Protocols/SIP/SIPProto.cpp
+++ b/Protocols/SIP/SIPProto.cpp
@@ -109,9 +109,49 @@ private:
 };
 
 
+static char * mir_pjstrdup(const pj_str_t *from)
+{
+	char *ret = (char *) mir_alloc(from->slen + 1);
+	strncpy(ret, from->ptr, from->slen);
+	ret[from->slen] = 0;
+	return ret;
+}
+
+
+static int FistGtZero(int n1, int n2)
+{
+	if (n1 > 0)
+		return n1;
+	return n2;
+}
+
+
+static TCHAR *CleanupSip(TCHAR *str)
+{
+	if (_tcsnicmp(_T("sip:"), str, 4) == 0)
+		return &str[4];
+	else
+		return str;
+}
+
+
+static const TCHAR *CleanupSip(const TCHAR *str)
+{
+	if (_tcsnicmp(_T("sip:"), str, 4) == 0)
+		return &str[4];
+	else
+		return str;
+}
+
+
+
+
+
 SIPProto::SIPProto(const char *aProtoName, const TCHAR *aUserName)
 {
-	//hasToDestroy = false;
+	InitializeCriticalSection(&cs);
+
+	hasToDestroy = false;
 	transport_id = -1;
 	acc_id = -1;
 	hNetlibUser = 0;
@@ -124,7 +164,7 @@ SIPProto::SIPProto(const char *aProtoName, const TCHAR *aUserName)
 
 	static OptPageControl amCtrls[] = { 
 		{ NULL,	CONTROL_TEXT,		IDC_HOST,			"Host", NULL, 0, 0, 256 },
-		{ NULL,	CONTROL_INT,		IDC_PORT,			"Port", 5060, 0, 1 },
+		{ NULL,	CONTROL_INT,		IDC_PORT,			"RegPort", 5060, 0, 1 },
 		{ NULL,	CONTROL_TEXT,		IDC_USERNAME,		"Username", NULL, 0, 0, 16 },
 		{ NULL,	CONTROL_PASSWORD,	IDC_PASSWORD,		"Password", NULL, IDC_SAVEPASSWORD, 0, 16 },
 		{ NULL,	CONTROL_CHECKBOX,	IDC_SAVEPASSWORD,	"SavePassword", (BYTE) TRUE },
@@ -132,32 +172,65 @@ SIPProto::SIPProto(const char *aProtoName, const TCHAR *aUserName)
 
 	memmove(accountManagerCtrls, amCtrls, sizeof(accountManagerCtrls));
 	accountManagerCtrls[0].var = &opts.host;
-	accountManagerCtrls[1].var = &opts.port;
+	accountManagerCtrls[1].var = &opts.reg.port;
 	accountManagerCtrls[2].var = &opts.username;
 	accountManagerCtrls[3].var = &opts.password;
 	accountManagerCtrls[4].var = &opts.savePassword;
 
 	static OptPageControl oCtrls[] = { 
 		{ NULL,	CONTROL_TEXT,		IDC_HOST,			"Host", NULL, 0, 0, 256 },
-		{ NULL,	CONTROL_INT,		IDC_PORT,			"Port", 5060, 0, 1 },
 		{ NULL,	CONTROL_TEXT,		IDC_USERNAME,		"Username", NULL, 0, 0, 16 },
 		{ NULL,	CONTROL_PASSWORD,	IDC_PASSWORD,		"Password", NULL, IDC_SAVEPASSWORD, 0, 16 },
 		{ NULL,	CONTROL_CHECKBOX,	IDC_SAVEPASSWORD,	"SavePassword", (BYTE) TRUE },
-		{ NULL,	CONTROL_TEXT,		IDC_STUN_HOST,		"StunHost", _T("stun01.sipphone.com"), 0, 0, 256 },
-		{ NULL,	CONTROL_INT,		IDC_STUN_PORT,		"StunPort", 0, 0, 1 },
+		{ NULL,	CONTROL_TEXT,		IDC_REG_HOST,		"RegHost", NULL, 0, 0, 256 },
+		{ NULL,	CONTROL_INT,		IDC_REG_PORT,		"RegPort", 5060, 0, 0 },
+		{ NULL,	CONTROL_TEXT,		IDC_REALM,			"Realm", NULL, 0, 0, 256 },
+		{ NULL,	CONTROL_TEXT,		IDC_DNS_HOST,		"DNSHost", NULL, 0, 0, 256 },
+		{ NULL,	CONTROL_INT,		IDC_DNS_PORT,		"DNSPort", 53, 0, 0 },
+		{ NULL,	CONTROL_TEXT,		IDC_STUN_HOST,		"STUNHost", (DWORD) _T("stun01.sipphone.com"), 0, 0, 256 },
+		{ NULL,	CONTROL_INT,		IDC_STUN_PORT,		"STUNPort", PJ_STUN_PORT, 0, 0 },
+		{ NULL,	CONTROL_TEXT,		IDC_PROXY_HOST,		"ProxyHost", NULL, 0, 0, 256 },
+		{ NULL,	CONTROL_INT,		IDC_PROXY_PORT,		"ProxyPort", 5060, 0, 0 },
+		{ NULL,	CONTROL_CHECKBOX,	IDC_PUBLISH,		"Publish", (BYTE) FALSE },
 	};
 
 	memmove(optionsCtrls, oCtrls, sizeof(optionsCtrls));
 	optionsCtrls[0].var = &opts.host;
-	optionsCtrls[1].var = &opts.port;
-	optionsCtrls[2].var = &opts.username;
-	optionsCtrls[3].var = &opts.password;
-	optionsCtrls[4].var = &opts.savePassword;
-	optionsCtrls[5].var = &opts.stun.host;
-	optionsCtrls[6].var = &opts.stun.port;
+	optionsCtrls[1].var = &opts.username;
+	optionsCtrls[2].var = &opts.password;
+	optionsCtrls[3].var = &opts.savePassword;
+	optionsCtrls[4].var = &opts.reg.host;
+	optionsCtrls[5].var = &opts.reg.port;
+	optionsCtrls[6].var = &opts.realm;
+	optionsCtrls[7].var = &opts.dns.host;
+	optionsCtrls[8].var = &opts.dns.port;
+	optionsCtrls[9].var = &opts.stun.host;
+	optionsCtrls[10].var = &opts.stun.port;
+	optionsCtrls[11].var = &opts.proxy.host;
+	optionsCtrls[12].var = &opts.proxy.port;
+	optionsCtrls[13].var = &opts.publish;
 
 	LoadOpts(optionsCtrls, MAX_REGS(optionsCtrls), m_szModuleName);
 
+	for(HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+		hContact != NULL; 
+		hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0)) 
+	{
+		if (!IsMyContact(hContact))
+			continue;
+		
+		DBDeleteContactSetting(hContact, m_szModuleName, "Status");
+		DBDeleteContactSetting(hContact, m_szModuleName, "ID");
+	}
+
+	char setting[256];
+	mir_snprintf(setting, MAX_REGS(setting), "%s/Status", m_szModuleName);
+	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM) setting);
+
+	mir_snprintf(setting, sizeof(setting), "%s/ID", m_szModuleName);
+	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM) setting);
+
+
 	CreateProtoService(PS_CREATEACCMGRUI, &SIPProto::CreateAccMgrUI);
 
 	CreateProtoService(PS_VOICE_CAPS, &SIPProto::VoiceCaps);
@@ -171,6 +244,7 @@ SIPProto::SIPProto(const char *aProtoName, const TCHAR *aUserName)
 	hCallStateEvent = CreateProtoEvent(PE_VOICE_CALL_STATE);
 
 	HookProtoEvent(ME_OPT_INITIALISE, &SIPProto::OnOptionsInit);
+	HookProtoEvent(ME_DB_CONTACT_DELETED, &SIPProto::OnContactDeleted);
 }
 
 
@@ -181,6 +255,15 @@ SIPProto::~SIPProto()
 	mir_free(m_tszUserName);
 	mir_free(m_szProtoName);
 	mir_free(m_szModuleName);
+
+	DeleteCriticalSection(&cs);
+}
+
+
+bool SIPProto::IsMyContact(HANDLE hContact)
+{
+	char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);
+	return proto != NULL && strcmp(m_szModuleName, proto) == 0;
 }
 
 
@@ -189,20 +272,21 @@ DWORD_PTR __cdecl SIPProto::GetCaps( int type, HANDLE hContact )
 	switch(type) 
 	{
 		case PFLAGNUM_1:
-			return 0;
+			return PF1_MODEMSG | PF1_IM | PF1_AUTHREQ | PF1_BASICSEARCH | PF1_ADDSEARCHRES;
 
 		case PFLAGNUM_2:
 			return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND 
 					 | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE | PF2_INVISIBLE | PF2_IDLE;
 
 		case PFLAGNUM_3:
-			return 0;
+			return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND 
+					 | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE | PF2_INVISIBLE | PF2_IDLE;
 
 		case PFLAGNUM_4:
-			return PF4_NOCUSTOMAUTH;
+			return PF4_SUPPORTTYPING | PF4_FORCEADDED | PF4_NOCUSTOMAUTH;
 
 		case PFLAG_UNIQUEIDTEXT:
-			return (UINT_PTR) Translate("User");
+			return (UINT_PTR) Translate("Username");
 
 		case PFLAG_UNIQUEIDSETTING:
 			return (UINT_PTR) "Username";
@@ -215,33 +299,356 @@ DWORD_PTR __cdecl SIPProto::GetCaps( int type, HANDLE hContact )
 }
 
 
+static void CALLBACK ProcessEvents(void *param)
+{
+	for(int i = 0; i < instances.getCount(); ++i)
+	{
+		SIPProto *proto = &instances[i];
+
+		EnterCriticalSection(&proto->cs);
+
+		std::vector<SIPEvent> events(proto->events);
+		proto->events.clear();
+
+		LeaveCriticalSection(&proto->cs);
+
+		if (proto->m_iStatus == ID_STATUS_OFFLINE)
+			continue;
+
+		for(unsigned int i = 0; i < events.size(); ++i)
+		{
+			SIPEvent &ev = events[i];
+			switch(ev.type)
+			{
+				case SIPEvent::reg_state:
+					proto->on_reg_state();
+					break;
+				case SIPEvent::incoming_call:
+					proto->on_incoming_call(ev.call_id);
+					break;
+				case SIPEvent::call_state:
+					proto->on_call_state(ev.call_id, ev.call_info);
+					break;
+				case SIPEvent::call_media_state:
+					proto->on_call_media_state(ev.call_id);
+					break;
+				case SIPEvent::incoming_subscribe:
+					proto->on_incoming_subscribe(ev.from, ev.text);
+					break;
+				case SIPEvent::buddy_state:
+					proto->on_buddy_state(ev.buddy_id);
+					break;
+				case SIPEvent::pager:
+					proto->on_pager(ev.from, ev.text, ev.mime);
+					break;
+				case SIPEvent::typing:
+					proto->on_typing(ev.from, ev.isTyping);
+					break;
+			}
+			mir_free(ev.from);
+			mir_free(ev.text);
+			mir_free(ev.mime);
+		}
+	}
+}
+
+
+static void static_on_reg_state(pjsua_acc_id acc_id)
+{
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(acc_id);
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::reg_state;
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+static void static_on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *rdata)
+{
+	pjsua_call_info info;
+	pj_status_t status = pjsua_call_get_info(call_id, &info);
+	if (status != PJ_SUCCESS)
+		return;
+
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(acc_id);
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::incoming_call;
+	ev.call_id = call_id;
+	ev.call_info = info;
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+static void static_on_call_state(pjsua_call_id call_id, pjsip_event *e)
+{
+	pjsua_call_info info;
+	pj_status_t status = pjsua_call_get_info(call_id, &info);
+	if (status != PJ_SUCCESS)
+		return;
+
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(info.acc_id);
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::call_state;
+	ev.call_id = call_id;
+	ev.call_info = info;
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+static void static_on_call_media_state(pjsua_call_id call_id)
+{
+	pjsua_call_info info;
+	pj_status_t status = pjsua_call_get_info(call_id, &info);
+	if (status != PJ_SUCCESS)
+		return;
+
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(info.acc_id);
+	if (proto == NULL)
+		return;
+
+	if (!proto->on_call_media_state_sync(call_id, info))
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::call_media_state;
+	ev.call_id = call_id;
+	ev.call_info = info;
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+// Handler for incoming presence subscription request
+static void static_on_incoming_subscribe(pjsua_acc_id acc_id, pjsua_srv_pres *srv_pres,
+										 pjsua_buddy_id buddy_id, const pj_str_t *from,
+										 pjsip_rx_data *rdata, pjsip_status_code *code,
+										 pj_str_t *reason, pjsua_msg_data *msg_data)
+{
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(acc_id);
+	if (proto == NULL)
+		return;
+
+	if (!proto->on_incoming_subscribe_sync(srv_pres, buddy_id, from, rdata, code, reason, msg_data))
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::incoming_subscribe;
+	ev.buddy_id = buddy_id;
+	ev.from = mir_pjstrdup(from);
+	ev.text = mir_pjstrdup(reason);
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+// Handler on buddy state changed.
+static void static_on_buddy_state(pjsua_buddy_id buddy_id)
+{
+	pjsua_buddy_info info;
+    pj_status_t status = pjsua_buddy_get_info(buddy_id, &info);
+	if (status != PJ_SUCCESS)
+		return;
+
+	HANDLE hContact = (HANDLE) pjsua_buddy_get_user_data(buddy_id);
+	if (hContact == NULL)
+		return;
+
+	SIPProto *proto = NULL;
+	for(int i = 0; i < instances.getCount(); ++i)
+	{
+		SIPProto *candidate = &instances[i];
+		if (candidate->IsMyContact(hContact))
+		{
+			proto = candidate;
+			break;
+		}
+	}
+
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::buddy_state;
+	ev.buddy_id = buddy_id;
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+static SIPProto * FindProto(const TCHAR *uri)
+{
+	for(int i = 0; i < instances.getCount(); ++i)
+	{
+		SIPProto *proto = &instances[i];
+
+		TCHAR tmp[1024];
+		mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s@%s"), 
+					  CleanupSip(proto->opts.username), proto->opts.host);
+
+		if (lstrcmpi(uri, tmp) == 0)
+			return proto;
+	}
+
+	return NULL;
+}
+
+
+// Incoming IM message (i.e. MESSAGE request)!
+static void static_on_pager(pjsua_call_id call_id, const pj_str_t *from, 
+							const pj_str_t *to, const pj_str_t *contact,
+							const pj_str_t *mime_type, const pj_str_t *text,
+							pjsip_rx_data *rdata, pjsua_acc_id acc_id)
+{
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(acc_id);
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::pager;
+	ev.from = mir_pjstrdup(from);
+	ev.text = mir_pjstrdup(text);
+	ev.mime = mir_pjstrdup(mime_type);
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+// Received typing indication
+static void static_on_typing(pjsua_call_id call_id, const pj_str_t *from,
+							 const pj_str_t *to, const pj_str_t *contact,
+							 pj_bool_t is_typing, pjsip_rx_data *rdata,
+							 pjsua_acc_id acc_id)
+{
+	SIPProto *proto = (SIPProto *) pjsua_acc_get_user_data(acc_id);
+	if (proto == NULL)
+		return;
+
+	SIPEvent ev;
+	memset(&ev, 0, sizeof(ev));
+	ev.type = SIPEvent::typing;
+	ev.from = mir_pjstrdup(from);
+	ev.isTyping = (is_typing != PJ_FALSE);
+
+	EnterCriticalSection(&proto->cs);
+	proto->events.push_back(ev);
+	LeaveCriticalSection(&proto->cs);
+	
+	CallFunctionAsync(&ProcessEvents, NULL);
+}
+
+
+static void static_on_log(int level, const char *data, int len)
+{
+	char tmp[1024];
+	mir_snprintf(tmp, MAX_REGS(tmp), "Level %d : %*s", level, len, data);
+	OutputDebugStringA(tmp);
+}
+
+
 int SIPProto::Connect()
 {
 	Trace(_T("Connecting..."));
 
 	BroadcastStatus(ID_STATUS_CONNECTING);
-/*
+
 	{
 		pj_status_t status = pjsua_create();
 		if (status != PJ_SUCCESS) 
 		{
-			Error(status, _T("Error creating pjsua!"));
+			Error(status, _T("Error creating pjsua"));
 			return -1;
 		}
 		hasToDestroy = true;
 	}
 
 	{
+		scoped_mir_free<char> stun;
+		scoped_mir_free<char> dns;
+
 		pjsua_config cfg;
 		pjsua_config_default(&cfg);
 		cfg.cb.on_incoming_call = &static_on_incoming_call;
 		cfg.cb.on_call_media_state = &static_on_call_media_state;
 		cfg.cb.on_call_state = &static_on_call_state;
 		cfg.cb.on_reg_state = &static_on_reg_state;
+		cfg.cb.on_incoming_subscribe = &static_on_incoming_subscribe;
+		cfg.cb.on_buddy_state = &static_on_buddy_state;
+		cfg.cb.on_pager2 = &static_on_pager;
+		cfg.cb.on_typing2 = &static_on_typing;
+
+
+		if (!IsEmpty(opts.stun.host))
+		{
+			TCHAR tmp[1024];
+			mir_sntprintf(tmp, MAX_REGS(tmp), _T("%s:%d"), 
+				CleanupSip(opts.stun.host), 
+				FistGtZero(opts.stun.port, PJ_STUN_PORT));
+			stun = TcharToUtf8(tmp).detach();
+
+			cfg.stun_srv_cnt = 1;
+			cfg.stun_srv[0] = pj_str(stun);
+		}
+
+		if (!IsEmpty(opts.dns.host))
+		{
+			TCHAR tmp[1024];
+			mir_sntprintf(tmp, MAX_REGS(tmp), _T("%s:%d"), 
+				CleanupSip(opts.dns.host), 
+				FistGtZero(opts.dns.port, 53));
+			dns = TcharToUtf8(tmp).detach();
+
+			cfg.nameserver_count = 1;
+			cfg.nameserver[0] = pj_str(dns);
+		}
 
 		pjsua_logging_config log_cfg;
 		pjsua_logging_config_default(&log_cfg);
-		log_cfg.console_level = 4;
 		log_cfg.cb = &static_on_log;
 
 		pj_status_t status = pjsua_init(&cfg, &log_cfg, NULL);
@@ -252,7 +659,7 @@ int SIPProto::Connect()
 			return 1;
 		}
 	}
-*/
+
 	{
 		pjsua_transport_config cfg;
 		pjsua_transport_config_default(&cfg);
@@ -264,7 +671,7 @@ int SIPProto::Connect()
 			return 2;
 		}
 	}
-/*
+
 	{
 		pj_status_t status = pjsua_start();
 		if (status != PJ_SUCCESS)
@@ -274,27 +681,42 @@ int SIPProto::Connect()
 			return 3;
 		}
 	}
-*/
+
 	{
+		scoped_mir_free<char> proxy;
 		TCHAR tmp[1024];
 
 		pjsua_acc_config cfg;
 		pjsua_acc_config_default(&cfg);
 		cfg.user_data = this;
-		cfg.transport_id = transport_id;
+		//cfg.transport_id = transport_id;
 
-		mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s@%s"), opts.username, opts.host);
+		mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s@%s"), CleanupSip(opts.username), opts.host);
 		TcharToUtf8 id(tmp);
 		cfg.id = pj_str(id);
 
-		mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s:%d"), opts.host, opts.port);
+		mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s:%d"), 
+						CleanupSip(FirstNotEmpty(opts.reg.host, opts.host)), 
+						FistGtZero(opts.reg.port, 5060));
 		TcharToUtf8 reg_uri(tmp);
 		cfg.reg_uri = pj_str(reg_uri);
 
-		cfg.publish_enabled = PJ_TRUE;
+		if (!IsEmpty(opts.proxy.host))
+		{
+			mir_sntprintf(tmp, MAX_REGS(tmp), _T("sip:%s:%d"), 
+				CleanupSip(opts.proxy.host), 
+				FistGtZero(opts.proxy.port, 5060));
+			proxy = TcharToUtf8(tmp).detach();
+
+			cfg.proxy_cnt = 1;
+			cfg.proxy[0] = pj_str(proxy);
+		}
+
+		cfg.publish_enabled = (opts.publish ? PJ_TRUE : PJ_FALSE);
 
 		cfg.cred_count = 1;
-		TcharToUtf8 host(opts.host);
+
+		TcharToUtf8 host(CleanupSip(FirstNotEmpty(opts.realm, opts.host)));
 		cfg.cred_info[0].realm = pj_str(host);
 		cfg.cred_info[0].scheme = pj_str("digest");
 		TcharToUtf8 username(opts.username);
@@ -311,6 +733,43 @@ int SIPProto::Connect()
 		}
 	}
 
+	// Add contacts to buddy list
+	for(HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+		hContact != NULL; 
+		hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0)) 
+	{
+		if (!IsMyContact(hContact))
+			continue;
+
+		DBTString uri(hContact, m_szModuleName, "URI");
+		if (uri == NULL)
+		{
+			Error(_T("Contact %d has no URI!"), hContact);
+			continue;
+		}
+
+		TcharToUtf8 sip_uri(uri);
+
+		pjsua_buddy_config buddy_cfg;
+		pjsua_buddy_config_default(&buddy_cfg);
+
+		buddy_cfg.uri = pj_str(sip_uri);
+		buddy_cfg.subscribe = PJ_FALSE;
+		buddy_cfg.user_data = hContact;
+
+		pjsua_buddy_id buddy_id;
+		pj_status_t status = pjsua_buddy_add(&buddy_cfg, &buddy_id);
+		if (status != PJ_SUCCESS) 
+		{
+			Error(status, _T("Error adding buddy '%s'"), uri);
+			continue;
+		}
+
+		Attach(hContact, buddy_id);
+
+		pjsua_buddy_subscribe_pres(buddy_id, PJ_TRUE);
+	}
+
 	return 0;
 }
 
@@ -356,7 +815,7 @@ void SIPProto::BroadcastStatus(int newStatus)
 }
 
 
-void SIPProto::CreateProtoService(const char* szService, SIPServiceFunc serviceProc)
+void SIPProto::CreateProtoService(const char *szService, SIPServiceFunc serviceProc)
 {
 	char str[MAXMODULELABELLENGTH];
 
@@ -365,7 +824,7 @@ void SIPProto::CreateProtoService(const char* szService, SIPServiceFunc serviceP
 }
 
 
-void SIPProto::CreateProtoService(const char* szService, SIPServiceFuncParam serviceProc, LPARAM lParam)
+void SIPProto::CreateProtoService(const char *szService, SIPServiceFuncParam serviceProc, LPARAM lParam)
 {
 	char str[MAXMODULELABELLENGTH];
 	mir_snprintf(str, sizeof(str), "%s%s", m_szModuleName, szService);
@@ -373,7 +832,7 @@ void SIPProto::CreateProtoService(const char* szService, SIPServiceFuncParam ser
 }
 
 
-HANDLE SIPProto::CreateProtoEvent(const char* szService)
+HANDLE SIPProto::CreateProtoEvent(const char *szService)
 {
 	char str[MAXMODULELABELLENGTH];
 	mir_snprintf(str, sizeof(str), "%s%s", m_szModuleName, szService);
@@ -381,12 +840,19 @@ HANDLE SIPProto::CreateProtoEvent(const char* szService)
 }
 
 
-void SIPProto::HookProtoEvent(const char* szEvent, SIPEventFunc pFunc)
+void SIPProto::HookProtoEvent(const char *szEvent, SIPEventFunc pFunc)
 {
 	::HookEventObj(szEvent, (MIRANDAHOOKOBJ)*(void**)&pFunc, this);
 }
 
 
+void SIPProto::ForkThread(SipThreadFunc pFunc, void* param)
+{
+	UINT threadID;
+	CloseHandle((HANDLE)mir_forkthreadowner((pThreadFuncOwner)*(void**)&pFunc, this, param, &threadID));
+}
+
+
 
 int SIPProto::SendBroadcast(HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam)
 {
@@ -479,6 +945,10 @@ void SIPProto::Disconnect()
 {
 	Trace(_T("Disconnecting..."));
 
+	EnterCriticalSection(&cs);
+	events.clear();
+	LeaveCriticalSection(&cs);
+
 	if (acc_id >= 0)
 	{
 		SendPresence(ID_STATUS_OFFLINE);
@@ -491,13 +961,13 @@ void SIPProto::Disconnect()
 		pjsua_transport_close(transport_id, PJ_FALSE);
 		transport_id = -1;
 	}
-/*
+
 	if (hasToDestroy)
 	{
 		pjsua_destroy();
 		hasToDestroy = false;
 	}
-*/
+
 	BroadcastStatus(ID_STATUS_OFFLINE);
 }
 
@@ -650,13 +1120,6 @@ bool SIPProto::SendPresence(int proto_status)
 }
 
 
-void CALLBACK SIPProto::DisconnectProto(void *param)
-{
-	SIPProto *proto = (SIPProto *) param;
-	proto->Disconnect();
-}
-
-
 void SIPProto::on_reg_state()
 {
 	Trace(_T("on_reg_state"));
@@ -665,10 +1128,12 @@ void SIPProto::on_reg_state()
 	pj_status_t status = pjsua_acc_get_info(acc_id, &info);
 	if (status != PJ_SUCCESS)
 	{
-		Error(status, _T("Error obtaining call info"));
+		Error(status, _T("Error obtaining account info"));
 		return;
 	}
 
+	Trace(_T("on_reg_state : info.status = %d"), info.status);
+
 	if (info.status == PJSIP_SC_OK)
 	{
 		int status = (m_iDesiredStatus > ID_STATUS_OFFLINE ? m_iDesiredStatus : ID_STATUS_ONLINE);
@@ -677,7 +1142,7 @@ void SIPProto::on_reg_state()
 	}
 	else
 	{
-		CallFunctionAsync(&SIPProto::DisconnectProto, this);
+		Disconnect();
 	}
 }
 
@@ -691,7 +1156,7 @@ static void RemoveLtGt(TCHAR *str)
 	}
 }
 
-void SIPProto::on_incoming_call(pjsua_call_id call_id, pjsip_rx_data *rdata)
+void SIPProto::on_incoming_call(pjsua_call_id call_id)
 {
 	Trace(_T("on_incoming_call: %d"), call_id);
 
@@ -703,9 +1168,9 @@ void SIPProto::on_incoming_call(pjsua_call_id call_id, pjsip_rx_data *rdata)
 		return;
 	}
 
-	TCHAR numberBuff[1024];
-	lstrcpyn(numberBuff, SipToTchar(info.remote_contact), MAX_REGS(numberBuff));
-	RemoveLtGt(numberBuff);
+	TCHAR number[1024];
+	lstrcpyn(number, SipToTchar(info.remote_contact), MAX_REGS(number));
+	RemoveLtGt(number);
 
 	TCHAR name[256];
 	name[0] = 0;
@@ -716,44 +1181,26 @@ void SIPProto::on_incoming_call(pjsua_call_id call_id, pjsip_rx_data *rdata)
 		if (other != NULL)
 		{
 			lstrcpyn(name, &remote_info[1], min(MAX_REGS(name), other - remote_info));
-			if (IsEmpty(numberBuff))
+			if (IsEmpty(number))
 			{
-				lstrcpyn(numberBuff, other+2, MAX_REGS(numberBuff));
-				RemoveLtGt(numberBuff);
+				lstrcpyn(number, other+2, MAX_REGS(number));
+				RemoveLtGt(number);
 			}
 		}
 	}
 
-	if (IsEmpty(name) && IsEmpty(numberBuff))
-		lstrcpyn(numberBuff, remote_info, MAX_REGS(numberBuff));
-
-	TCHAR *number = numberBuff;
-
-	if (_tcsnicmp(_T("sip:"), number, 4) == 0)
-	{
-		number += 4;
-
-		TCHAR *host = _tcschr(number, _T('@'));
-		if (host != NULL && _tcsicmp(opts.host, host+1) == 0)
-			*host = 0;
-	}
+	if (IsEmpty(name) && IsEmpty(number))
+		lstrcpyn(number, remote_info, MAX_REGS(number));
+	else
+		CleanupURI(number, MAX_REGS(number), number);
 
 	NotifyCall(call_id, VOICE_STATE_RINGING, NULL, name, number);
 }
 
 
-void SIPProto::on_call_state(pjsua_call_id call_id, pjsip_event *e)
+void SIPProto::on_call_state(pjsua_call_id call_id, const pjsua_call_info &info)
 {
 	Trace(_T("on_call_state: %d"), call_id);
-
-	pjsua_call_info info;
-	pj_status_t status = pjsua_call_get_info(call_id, &info);
-	if (status != PJ_SUCCESS)
-	{
-		Error(status, _T("Error obtaining call info"));
-		return;
-	}
-
 	Trace(_T("Call info: %d / last: %d %s"), info.state, info.last_status, info.last_status_text);
 
 	switch(info.state)
@@ -774,17 +1221,9 @@ void SIPProto::on_call_state(pjsua_call_id call_id, pjsip_event *e)
 }
 
 
-void SIPProto::on_call_media_state(pjsua_call_id call_id)
+bool SIPProto::on_call_media_state_sync(pjsua_call_id call_id, const pjsua_call_info &info)
 {
-	Trace(_T("on_call_media_state: %d"), call_id);
-
-	pjsua_call_info info;
-	pj_status_t status = pjsua_call_get_info(call_id, &info);
-	if (status != PJ_SUCCESS)
-	{
-		Error(status, _T("Error obtaining call info"));
-		return;
-	}
+	Trace(_T("on_call_media_state_sync: %d"), call_id);
 
 	// Connect ports appropriately when media status is ACTIVE or REMOTE HOLD,
 	// otherwise we should NOT connect the ports.
@@ -796,6 +1235,22 @@ void SIPProto::on_call_media_state(pjsua_call_id call_id)
 		pjsua_conf_connect(0, info.conf_slot);
 	}
 
+	return true;
+}
+
+
+void SIPProto::on_call_media_state(pjsua_call_id call_id)
+{
+	Trace(_T("on_call_media_state: %d"), call_id);
+
+	pjsua_call_info info;
+	pj_status_t status = pjsua_call_get_info(call_id, &info);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error obtaining call info"));
+		return;
+	}
+
 	if (info.media_status == PJSUA_CALL_MEDIA_ACTIVE)
 	{
 		NotifyCall(call_id, VOICE_STATE_TALKING);
@@ -882,6 +1337,20 @@ static void CleanupNumber(TCHAR *out, int outSize, const TCHAR *number)
 }
 
 
+void SIPProto::CleanupURI(TCHAR *out, int outSize, const TCHAR *url)
+{
+	lstrcpyn(out, CleanupSip(url), outSize);
+
+	TCHAR *phone = _tcsstr(out, _T(";user=phone"));
+	if (phone != NULL)
+		*phone = 0;
+
+	TCHAR *host = _tcschr(out, _T('@'));
+	if (host != NULL && _tcsicmp(opts.host, host+1) == 0)
+		*host = 0;
+}
+
+
 void SIPProto::BuildURI(TCHAR *out, int outSize, const TCHAR *number, bool isTel)
 {
 	bool hasSip = (_tcsnicmp(_T("sip:"), number, 4) == 0);
@@ -897,10 +1366,8 @@ void SIPProto::BuildURI(TCHAR *out, int outSize, const TCHAR *number, bool isTel
 			CleanupNumber(tmp, MAX_REGS(tmp), number);
 			mir_sntprintf(out, outSize, _T("sip:%s@%s"), tmp, opts.host);
 		}
-		else if (!hasSip)
-			mir_sntprintf(out, outSize, _T("sip:%s"), number);
 		else
-			mir_sntprintf(out, outSize, _T("%s"), number);
+			mir_sntprintf(out, outSize, _T("sip:%s"), CleanupSip(number));
 
 		 if (!hasPhone)
 		 {
@@ -912,10 +1379,8 @@ void SIPProto::BuildURI(TCHAR *out, int outSize, const TCHAR *number, bool isTel
 	{
 		if (!hasSip && !hasHost)
 			mir_sntprintf(out, outSize, _T("sip:%s@%s"), number, opts.host);
-		else if (!hasSip)
-			mir_sntprintf(out, outSize, _T("sip:%s"), number);
 		else
-			mir_sntprintf(out, outSize, _T("%s"), number);
+			mir_sntprintf(out, outSize, _T("sip:%s"), CleanupSip(number));
 	}
 }
 
@@ -1099,8 +1564,382 @@ int __cdecl SIPProto::VoiceCallStringValid(WPARAM wParam, LPARAM lParam)
 }
 
 
+// Buddy ////////////////////////////////////////////////////////////////////////////////
+
+
+HANDLE __cdecl SIPProto::SearchBasic(const char *id) 
+{
+	if (m_iStatus <= ID_STATUS_OFFLINE)
+		return 0;
+
+	TCHAR tmp[1024];
+	BuildURI(tmp, MAX_REGS(tmp), CharToTchar(id), false);
+
+	TCHAR *uri = mir_tstrdup(tmp); 
+	ForkThread(&SIPProto::SearchUserThread, uri);
+
+	return uri;
+}
+
+
+void __cdecl SIPProto::SearchUserThread(void *param)
+{
+	TCHAR *uri = (TCHAR *) param;
+
+    pj_thread_desc desc;
+    pj_thread_t *this_thread;
+    pj_status_t status = pj_thread_register("SearchUserThread", desc, &this_thread);
+    if (status != PJ_SUCCESS) 
+	{
+        Error(status, _T("Error registering thread"));
+        return;
+    }
+
+	TcharToUtf8 sip_uri(uri);
+	if (pjsua_verify_sip_url(sip_uri) != PJ_SUCCESS)
+	{
+		Error(_T("Not a valid SIP URL: %s"), uri);
+		SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, param, 0);
+		return;
+	}
+
+	if (pjsua_buddy_find(&pj_str(sip_uri)) != PJSUA_INVALID_ID)
+	{
+		Info(_T("Contact already in your contact list"));
+		SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, param, 0);
+		return;
+	}
+
+	TCHAR name[1024];
+	CleanupURI(name, MAX_REGS(name), uri);
+	TcharToChar name_char(name);
+
+	PROTOSEARCHRESULT isr = {0};
+	isr.cbSize = sizeof(isr);
+	isr.nick = (char *) name_char.get();
+
+	SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, param, (LPARAM)&isr);
+	SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, param, 0);
+}
+
+
+HANDLE __cdecl SIPProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
+{
+	if (m_iStatus <= ID_STATUS_OFFLINE)
+		return NULL;
+
+	TCHAR uri[1024];
+	BuildURI(uri, MAX_REGS(uri), CharToTchar(psr->nick), false);
+	TcharToUtf8 sip_uri(uri);
+
+	HANDLE hContact;
+	pjsua_buddy_id buddy_id = pjsua_buddy_find(&pj_str(sip_uri));
+	if (buddy_id != PJSUA_INVALID_ID)
+	{
+		// Already on list
+		hContact = GetContact(buddy_id);
+	}
+	else
+	{
+		// Add to list
+		pjsua_buddy_config buddy_cfg;
+		pjsua_buddy_config_default(&buddy_cfg);
+
+		buddy_cfg.uri = pj_str(sip_uri);
+		buddy_cfg.subscribe = PJ_FALSE;
+
+		pj_status_t status = pjsua_buddy_add(&buddy_cfg, &buddy_id);
+		if (status != PJ_SUCCESS) 
+		{
+			Error(status, _T("Error adding buddy '%s'"), uri);
+			return NULL;
+		}
+
+		hContact = (HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0);
+		CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM) m_szModuleName);
+
+		DBWriteContactSettingTString(hContact, m_szModuleName, "URI", uri);
+
+		TCHAR name[1024];
+		CleanupURI(name, MAX_REGS(name), uri);
+		DBWriteContactSettingTString(hContact, m_szModuleName, "Nick", name);
+		
+		Attach(hContact, buddy_id);
+
+		pjsua_buddy_subscribe_pres(buddy_id, PJ_TRUE);
+	}
+	
+	if (flags & PALF_TEMPORARY)
+	{
+		DBWriteContactSettingByte(hContact, "CList", "NotOnList", 1);
+		DBWriteContactSettingByte(hContact, "CList", "Hidden", 1);
+	}
+	else
+	{
+		DBDeleteContactSetting(hContact, "CList", "NotOnList");
+		DBDeleteContactSetting(hContact, "CList", "Hidden");
+	}
+
+	return hContact;
+}
+
+
+// Handler for incoming presence subscription request
+bool SIPProto::on_incoming_subscribe_sync(pjsua_srv_pres *srv_pres,
+										  pjsua_buddy_id buddy_id,
+										  const pj_str_t *from,
+										  pjsip_rx_data *rdata,
+										  pjsip_status_code *code,
+										  pj_str_t *reason,
+										  pjsua_msg_data *msg_data)
+{
+    // Just accept the request (the default behavior)
+	return true;
+}
+
+
+void SIPProto::on_incoming_subscribe(char *from, char *text)
+{
+}
+
+
+void SIPProto::on_buddy_state(pjsua_buddy_id buddy_id)
+{
+	HANDLE hContact = GetContact(buddy_id);
+	if (hContact == NULL)
+		return;
+
+	pjsua_buddy_info info;
+    pj_status_t status = pjsua_buddy_get_info(buddy_id, &info);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error obtaining buddy info"));
+		DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);
+		return;
+	}
+
+	if (info.sub_state == PJSIP_EVSUB_STATE_NULL && info.sub_term_code == 404)
+	{
+		DBTString nick(hContact, m_szModuleName, "Nick");
+		Info(_T("User '%s' not found on the server!"), nick.get());
+		DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);
+		return;
+	}
+
+	if (info.sub_state != PJSIP_EVSUB_STATE_ACTIVE)
+	{
+		DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);
+		return;
+	}
+
+	// TODO info.rpid
+
+	switch(info.status)
+	{
+		case PJSUA_BUDDY_STATUS_ONLINE:
+		{
+			DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_ONLINE);
+			break;
+		}
+		case PJSUA_BUDDY_STATUS_OFFLINE:
+		{
+			DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);
+			break;
+		}
+		default:
+		{
+			break;
+		}
+	}
+}
+
+
+void SIPProto::on_pager(char *from, char *text, char *mime_type)
+{
+	// Ignore empty messages
+	if (strlen(text) < 1)
+		return;
+
+	pjsua_buddy_id buddy_id = pjsua_buddy_find(&pj_str(from));
+	if (buddy_id == PJSUA_INVALID_ID)
+	{
+		// TODO
+		return;
+	}
+
+	HANDLE hContact = GetContact(buddy_id);
+	if (hContact == NULL)
+		return;
+
+	if (strcmp("text/plain", mime_type) != 0)
+	{
+		Error(_T("Unknown mime type: %s"), Utf8ToTchar(mime_type));
+		return;
+	}
+
+	CallService(MS_PROTO_CONTACTISTYPING, (WPARAM) hContact, 0);
+
+	PROTORECVEVENT pre;
+	pre.szMessage = (char*) text;
+	pre.flags = PREF_UTF;
+	pre.timestamp = (DWORD) time(NULL);
+	pre.lParam = 0;
+
+	CCSDATA ccs = {0};
+	ccs.hContact = hContact;
+	ccs.szProtoService = PSR_MESSAGE;
+	ccs.wParam = 0;
+	ccs.lParam = (LPARAM) &pre;
+	CallService(MS_PROTO_CHAINRECV, 0, (LPARAM) &ccs);
+}
+
+
+int __cdecl SIPProto::SendMsg(HANDLE hContact, int flags, const char *msg)
+{
+	if (m_iStatus <= ID_STATUS_OFFLINE)
+		return 0;
+
+	pjsua_buddy_id buddy_id = GetBuddy(hContact);
+	if (buddy_id == PJSUA_INVALID_ID)
+		return 0;
+	
+	pjsua_buddy_info info;
+    pj_status_t status = pjsua_buddy_get_info(buddy_id, &info);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error obtaining buddy info"));
+		return 0;
+	}
+
+	scoped_mir_free<char> text;
+	if (flags & PREF_UNICODE) 
+	{
+		const char* p = strchr(msg, '\0');
+		if (p != msg) 
+		{
+			while (*(++p) == '\0') {}
+			text = mir_utf8encodeW((wchar_t *) p);
+		}
+		else
+		{
+			text = mir_strdup(msg);
+		}
+	}
+	else
+	{
+		text = (flags & PREF_UTF) ? mir_strdup(msg) : mir_utf8encode(msg);
+	}
+
+	// TODO Send to call
+
+	status = pjsua_im_send(acc_id, &info.uri, NULL, &pj_str(text), NULL, NULL);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error sending message"));
+		return 0;
+	}
+
+	return 0;
+}
+
+
+void SIPProto::on_typing(char *from, bool isTyping)
+{
+	pjsua_buddy_id buddy_id = pjsua_buddy_find(&pj_str(from));
+	if (buddy_id == PJSUA_INVALID_ID)
+		return;
+
+	HANDLE hContact = GetContact(buddy_id);
+	if (hContact == NULL)
+		return;
+
+	CallService(MS_PROTO_CONTACTISTYPING, (WPARAM) hContact, isTyping ? 10 : 0);
+}
+
+
+int __cdecl SIPProto::UserIsTyping(HANDLE hContact, int type)
+{
+	if (m_iStatus <= ID_STATUS_OFFLINE)
+		return 0;
+
+	pjsua_buddy_id buddy_id = GetBuddy(hContact);
+	if (buddy_id == PJSUA_INVALID_ID)
+		return 0;
+
+	pjsua_buddy_info info;
+    pj_status_t status = pjsua_buddy_get_info(buddy_id, &info);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error obtaining buddy info"));
+		return 0;
+	}
+
+	// TODO Send to call
+
+	status = pjsua_im_typing(acc_id, &info.uri, type == PROTOTYPE_SELFTYPING_ON ? PJ_TRUE : PJ_FALSE, NULL);
+	if (status != PJ_SUCCESS)
+	{
+		Error(status, _T("Error sending typing notification"));
+		return 0;
+	}
+
+	return 0;
+}
+
+
+pjsua_buddy_id SIPProto::GetBuddy(HANDLE hContact)
+{
+	pjsua_buddy_id id =(pjsua_buddy_id) DBGetContactSettingDword(hContact, m_szModuleName, "ID", PJSUA_INVALID_ID);
+
+	if (id == PJSUA_INVALID_ID)
+		Error(_T("hContact has no buddy: %d"), hContact);
+	
+	return id;
+}
+
+
+HANDLE SIPProto::GetContact(pjsua_buddy_id buddy_id)
+{
+	HANDLE hContact = (HANDLE) pjsua_buddy_get_user_data(buddy_id);
+	
+	if (hContact == NULL)
+		Error(_T("Buddy has no hContact: %d"), buddy_id);
+	
+	return hContact;
+}
+
+
+void SIPProto::Attach(HANDLE hContact, pjsua_buddy_id buddy_id)
+{
+	DBWriteContactSettingDword(hContact, m_szModuleName, "ID", (DWORD) buddy_id);
+	pjsua_buddy_set_user_data(buddy_id, hContact);
+}
+
+
+int __cdecl SIPProto::OnContactDeleted(WPARAM wParam, LPARAM lParam)
+{
+	HANDLE hContact = (HANDLE) wParam;
+
+	if (acc_id < 0)
+		return 0;
+
+	if (!IsMyContact(hContact))
+		return 0;
+
+	Trace(_T("Deleted contact"));
+
+	pjsua_buddy_id buddy_id = GetBuddy(hContact);
+	if (buddy_id == PJSUA_INVALID_ID)
+		return 0;
+
+	pjsua_buddy_subscribe_pres(buddy_id, PJ_FALSE);
+	pjsua_buddy_del(buddy_id);
+
+	return 0;
+}
 
 
+// Dialog procs /////////////////////////////////////////////////////////////////////////
 
 
 static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)