[asterisk-commits] kharwell: branch kharwell/pimp_my_sip r385162 - in /team/kharwell/pimp_my_sip...

[SVN commits to the Asterisk project]

Author: kharwell
Date: Tue Apr  9 17:07:10 2013
New Revision: 385162

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385162
Log:
reverting message.c back to original

Modified:
    team/kharwell/pimp_my_sip/main/message.c
    team/kharwell/pimp_my_sip/res/res_sip_messaging.c

Modified: team/kharwell/pimp_my_sip/main/message.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_my_sip/main/message.c?view=diff&rev=385162&r1=385161&r2=385162
==============================================================================
--- team/kharwell/pimp_my_sip/main/message.c (original)
+++ team/kharwell/pimp_my_sip/main/message.c Tue Apr  9 17:07:10 2013
@@ -1114,7 +1114,8 @@
 	ao2_lock(msg);
 	ast_rwlock_rdlock(&tech_holder->tech_lock);
 	if (tech_holder->tech) {
-		res = tech_holder->tech->msg_send(msg, S_OR(args.to, ""), S_OR(args.from, ""));
+		res = tech_holder->tech->msg_send(msg, S_OR(args.to, ""),
+							S_OR(args.from, ""));
 	}
 	ast_rwlock_unlock(&tech_holder->tech_lock);
 	ao2_unlock(msg);

Modified: team/kharwell/pimp_my_sip/res/res_sip_messaging.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_my_sip/res/res_sip_messaging.c?view=diff&rev=385162&r1=385161&r2=385162
==============================================================================
--- team/kharwell/pimp_my_sip/res/res_sip_messaging.c (original)
+++ team/kharwell/pimp_my_sip/res/res_sip_messaging.c Tue Apr  9 17:07:10 2013
@@ -126,7 +126,7 @@
 	}
 
 	if (!(res = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", name)) && log) {
-		ast_log(LOG_ERROR, "SIP MESSAGE send - endpoint '%s' was not found\n", name);		
+		ast_log(LOG_ERROR, "SIP MESSAGE send - endpoint '%s' was not found\n", name);
 	}
 	return res;
 }
@@ -167,8 +167,6 @@
 	from_uri = pjsip_uri_get_uri(from_name_addr);
 
 	if ((hdr = pjsip_parse_hdr(tdata->pool, &hname, (char*)from, strlen(from), NULL))) {
-
-	/* if ((uri = pjsip_parse_uri(tdata->pool, (char*)from, strlen(from), 0))) { */
 		/* see if its in a 'name <sip:user at domain>' format */
 		name_addr = (pjsip_name_addr *)hdr->uri;
 		sip_uri = pjsip_uri_get_uri(name_addr->uri);
@@ -441,7 +439,7 @@
 	}
 
 	if (ast_sip_create_request("MESSAGE", NULL, ep, NULL, &tdata)) {
-		ast_log(LOG_ERROR, "SIP MESSAGE - Could not create request\n");		
+		ast_log(LOG_ERROR, "SIP MESSAGE - Could not create request\n");
 		return -1;
 	}
 
@@ -458,7 +456,7 @@
 	set_from(tdata, mdata->from);
 	vars_to_headers(mdata->msg, tdata);
 	if (ast_sip_send_request(tdata, NULL, ep)) {
-		ast_log(LOG_ERROR, "SIP MESSAGE - Could not send request\n");		
+		ast_log(LOG_ERROR, "SIP MESSAGE - Could not send request\n");
 		return -1;
 	}
 
@@ -470,7 +468,7 @@
 	struct msg_data *mdata;
 
 	if (ast_strlen_zero(to)) {
-		ast_log(LOG_ERROR, "SIP MESSAGE - a 'To' URI  must be specified\n");		
+		ast_log(LOG_ERROR, "SIP MESSAGE - a 'To' URI  must be specified\n");
 		return -1;
 	}