[asterisk-commits] may: branch may/smpp r403012 - in /team/may/smpp/trunk: ./ addons/res_smpp.c

[SVN commits to the Asterisk project]

Author: may
Date: Fri Nov 22 09:38:08 2013
New Revision: 403012

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403012
Log:
introduce registered_delivery smpp message parameters
(now we can send delivery reports)
........

Merged revisions 403011 from http://svn.asterisk.org/svn/asterisk/team/may/smpp/branches/10

Modified:
    team/may/smpp/trunk/   (props changed)
    team/may/smpp/trunk/addons/res_smpp.c

Propchange: team/may/smpp/trunk/
------------------------------------------------------------------------------
--- smpp-10-merge (original)
+++ smpp-10-merge Fri Nov 22 09:38:08 2013
@@ -1,1 +1,1 @@
-/team/may/smpp/branches/10:1-402222
+/team/may/smpp/branches/10:1-402222,403011

Propchange: team/may/smpp/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 22 09:38:08 2013
@@ -1,1 +1,1 @@
-/team/may/smpp/branches/10:400905-401373,401882,402222
+/team/may/smpp/branches/10:400905-401373,401882,402222,403011

Modified: team/may/smpp/trunk/addons/res_smpp.c
URL: http://svnview.digium.com/svn/asterisk/team/may/smpp/trunk/addons/res_smpp.c?view=diff&rev=403012&r1=403011&r2=403012
==============================================================================
--- team/may/smpp/trunk/addons/res_smpp.c (original)
+++ team/may/smpp/trunk/addons/res_smpp.c Fri Nov 22 09:38:08 2013
@@ -377,6 +377,8 @@
 #define FILL_MSG_HEADERS(msg, deliver, tmp) \
 		snprintf(tmp, sizeof(tmp), "%d", deliver->data_coding); \
 		ast_msg_set_var(msg, "dcs", tmp); \
+		snprintf(tmp, sizeof(tmp), "%d", deliver->registered_delivery); \
+		ast_msg_set_var(msg, "registered_delivery", tmp); \
 		snprintf(tmp, sizeof(tmp), "%s", deliver->service_type); \
 		ast_msg_set_var(msg, "service_type", tmp); \
 		snprintf(tmp, sizeof(tmp), "%d", deliver->esm_class); \
@@ -1246,7 +1248,6 @@
 			resp->delivered = 0;
 			ast_mutex_unlock(&resp->lock);
 			ast_cond_signal(&resp->cond);
-			ast_mutex_lock(&resp->lock);
 		}
 		AST_LIST_UNLOCK(&prev->respq);
 		AST_LIST_HEAD_DESTROY(&prev->respq);
@@ -1337,6 +1338,9 @@
 			(ast_msg_get_var(message, "service_type")) ? ast_msg_get_var(message, "service_type") : ""); \
 		if(ast_msg_get_var(message, "dcs")) { \
 			submit.data_coding = atoi(ast_msg_get_var(message, "dcs")); \
+		} \
+		if(ast_msg_get_var(message, "registered_delivery")) { \
+			submit.registered_delivery = atoi(ast_msg_get_var(message, "registered_delivery")); \
 		} \
 		if(ast_msg_get_var(message, "esm_class")) { \
 			submit.esm_class = atoi(ast_msg_get_var(message, "esm_class")); \