pua_dialoginfo: debug message to show whether avps are used or not

- adjusted code format to avoid very long line

src/modules/pua_dialoginfo/pua_dialoginfo.c

@@ -64,7 +64,7 @@ MODULE_VERSION
 #define DEF_DISABLE_CALLER_PUBLISH_FLAG -1
 #define DEF_DISABLE_CALLEE_PUBLISH_FLAG -1
 
-/* define PUA_DIALOGINFO_DEBUG to activate more verbose 
+/* define PUA_DIALOGINFO_DEBUG to activate more verbose
  * logging and dialog info callback debugging
  */
 /* #define PUA_DIALOGINFO_DEBUG 1 */
@@ -103,9 +103,8 @@ send_publish_t pua_send_publish;
 static int mod_init(void);
 
 
-static cmd_export_t cmds[]=
-{
-	{0, 0, 0, 0, 0, 0} 
+static cmd_export_t cmds[]={
+	{0, 0, 0, 0, 0, 0}
 };
 
 static param_export_t params[]={
@@ -182,8 +181,9 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 				LM_ERR("bad reply or missing TO header\n");
 				tag.s = 0;
 				tag.len = 0;
-			} else 
+			} else {
 				tag = get_to(msg)->tag_value;
+			}
 		} else {
 			tag = get_to(msg)->tag_value;
 			if (tag.s==0 || tag.len==0) {
@@ -274,14 +274,16 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 		case DLGCB_EXPIRED:
 			LM_DBG("dialog over, from=%.*s\n", dlginfo->from_uri.len,
 					dlginfo->from_uri.s);
-			if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+			if (disable_caller_publish_flag == -1 || !(request
+						&& (request->flags & (1<<disable_caller_publish_flag))))
 			{
 				dialog_publish_multi("terminated", dlginfo->pubruris_caller,
 						&(dlginfo->from_uri), &uri, &(dlginfo->callid), 1,
 						10, 0, 0, &(dlginfo->from_contact),
 						&target, send_publish_flag==-1?1:0);
 			}
-			if (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag))))
+			if (disable_callee_publish_flag == -1 || !(request
+						&& (request->flags & (1<<disable_callee_publish_flag))))
 			{
 				dialog_publish_multi("terminated", dlginfo->pubruris_callee,
 						&uri, &(dlginfo->from_uri), &(dlginfo->callid), 0,
@@ -294,14 +296,16 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 		case DLGCB_CONFIRMED_NA:
 			LM_DBG("dialog confirmed, from=%.*s\n", dlginfo->from_uri.len,
 					dlginfo->from_uri.s);
-			if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+			if (disable_caller_publish_flag == -1 || !(request
+						&& (request->flags & (1<<disable_caller_publish_flag))))
 			{
 				dialog_publish_multi("confirmed", dlginfo->pubruris_caller,
 						&(dlginfo->from_uri), &uri, &(dlginfo->callid), 1,
 						dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target,
 						send_publish_flag==-1?1:0);
 			}
-			if (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag))))
+			if (disable_callee_publish_flag == -1 || !(request
+						&& (request->flags & (1<<disable_callee_publish_flag))))
 			{
 				dialog_publish_multi("confirmed", dlginfo->pubruris_callee, &uri,
 						&(dlginfo->from_uri), &(dlginfo->callid), 0,
@@ -340,7 +344,8 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 						tag.len = 0;
 					}
 				}
-				if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+				if (disable_caller_publish_flag == -1 || !(request
+							&& (request->flags & (1<<disable_caller_publish_flag))))
 				{
 					if (caller_confirmed) {
 						dialog_publish_multi("confirmed", dlginfo->pubruris_caller,
@@ -356,7 +361,8 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 								send_publish_flag==-1?1:0);
 					}
 				}
-				if (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag))))
+				if (disable_callee_publish_flag == -1 || !(request &&
+							(request->flags & (1<<disable_callee_publish_flag))))
 				{
 					dialog_publish_multi("early", dlginfo->pubruris_callee, &uri,
 							&(dlginfo->from_uri), &(dlginfo->callid), 0,
@@ -365,7 +371,8 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 				}
 
 			} else {
-				if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+				if (disable_caller_publish_flag == -1 || !(request &&
+							(request->flags & (1<<disable_caller_publish_flag))))
 				{
 					if (caller_confirmed) {
 						dialog_publish_multi("confirmed", dlginfo->pubruris_caller,
@@ -380,7 +387,8 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 								&target, send_publish_flag==-1?1:0);
 					}
 				}
-				if (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag))))
+				if (disable_callee_publish_flag == -1 || !(request
+							&& (request->flags & (1<<disable_callee_publish_flag))))
 				{
 					dialog_publish_multi("early", dlginfo->pubruris_callee, &uri,
 							&(dlginfo->from_uri), &(dlginfo->callid), 0,
@@ -392,14 +400,16 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para
 		default:
 			LM_ERR("unhandled dialog callback type %d received, from=%.*s\n",
 					type, dlginfo->from_uri.len, dlginfo->from_uri.s);
-			if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+			if (disable_caller_publish_flag == -1 || !(request &&
+						(request->flags & (1<<disable_caller_publish_flag))))
 			{
 				dialog_publish_multi("terminated", dlginfo->pubruris_caller,
 						&(dlginfo->from_uri), &uri, &(dlginfo->callid), 1,
 						10, 0, 0, &(dlginfo->from_contact), &target,
 						send_publish_flag==-1?1:0);
 			}
-			if (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag))))
+			if (disable_callee_publish_flag == -1 || !(request &&
+						(request->flags & (1<<disable_callee_publish_flag))))
 			{
 				dialog_publish_multi("terminated", dlginfo->pubruris_callee, &uri,
 						&(dlginfo->from_uri), &(dlginfo->callid), 0,
@@ -594,7 +604,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type)
 
 #ifdef PUA_DIALOGINFO_DEBUG
 	/* dialog callback testing (registered last to be executed frist) */
-	if (dlg_api.register_dlgcb(dlg, 
+	if (dlg_api.register_dlgcb(dlg,
 				DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED
 				| DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED
 				| DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN
@@ -628,7 +638,8 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 	if(dlginfo==NULL)
 		return;
 
-	if (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))
+	if (disable_caller_publish_flag == -1 || !(request && (request->flags
+					& (1<<disable_caller_publish_flag))))
 	{
 		dialog_publish_multi("Trying", dlginfo->pubruris_caller,
 				&(dlg->from_uri),
@@ -637,7 +648,8 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 				0, 0, 0, 0, (send_publish_flag==-1)?1:0);
 	}
 
-	if (callee_trying && (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag)))))
+	if (callee_trying && (disable_callee_publish_flag == -1 || !(request
+					&& (request->flags & (1<<disable_callee_publish_flag)))))
 	{
 		dialog_publish_multi("Trying", dlginfo->pubruris_callee,
 				(include_req_uri)?&(dlg->req_uri):&(dlg->to_uri),
@@ -652,7 +664,8 @@ __dialog_loaded(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 {
 	struct dlginfo_cell *dlginfo;
 
-	LM_DBG("INVITE dialog loaded: from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s);
+	LM_DBG("INVITE dialog loaded: from=%.*s\n",
+			dlg->from_uri.len, dlg->from_uri.s);
 
 	dlginfo=get_dialog_data(dlg, type);
 	if(dlginfo!=NULL) {
@@ -673,11 +686,15 @@ static int mod_init(void)
 	str s;
 	pv_spec_t avp_spec;
 
-	if(caller_dlg_var.len<=0)
-		LM_WARN("pubruri_caller_dlg_var is not set - restore on restart disabled\n");
+	if(caller_dlg_var.len<=0) {
+		LM_WARN("pubruri_caller_dlg_var is not set"
+				" - restore on restart disabled\n");
+	}
 
-	if(callee_dlg_var.len<=0)
-		LM_WARN("pubruri_callee_dlg_var is not set - restore on restart disabled\n");
+	if(callee_dlg_var.len<=0) {
+		LM_WARN("pubruri_callee_dlg_var is not set"
+				" - restore on restart disabled\n");
+	}
 
 	bind_pua= (bind_pua_t)find_export("bind_pua", 1,0);
 	if (!bind_pua)
@@ -715,7 +732,7 @@ static int mod_init(void)
 	}
 
 	if(use_pubruri_avps) {
-
+		LM_DBG("configured to use avps for uri values\n");
 		if((pubruri_caller_avp==NULL || *pubruri_caller_avp==0)
 				|| (pubruri_callee_avp==NULL || *pubruri_callee_avp==0)) {
 			LM_ERR("pubruri_caller_avp and pubruri_callee_avp must be set,"
@@ -744,7 +761,8 @@ static int mod_init(void)
 			LM_ERR("[%s]- invalid AVP definition\n", pubruri_callee_avp);
 			return -1;
 		}
-
+	} else {
+		LM_DBG("configured to use headers for uri values\n");
 	}
 
 	return 0;