Bladeren bron

modules_k/dialog: Prefix get_valid_msg() function name with "dlg_"
and turn static inline to enable usage when the dialog module is
not linked in.

- modules_k/pua_dialoginfo: Use changed function name.

Timo Reimann 14 jaren geleden
bovenliggende
commit
3b7a97f8f4
3 gewijzigde bestanden met toevoegingen van 20 en 23 verwijderingen
  1. 0 21
      modules_k/dialog/dlg_cb.c
  2. 19 1
      modules_k/dialog/dlg_cb.h
  3. 1 1
      modules_k/pua_dialoginfo/pua_dialoginfo.c

+ 0 - 21
modules_k/dialog/dlg_cb.c

@@ -260,24 +260,3 @@ void run_dlg_callbacks( int type ,
 	}
 	return;
 }
-
-
-struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params)
-{
-	struct sip_msg *msg;
-
-	if (cb_params == NULL) {
-		LM_ERR("no dialog parameters given\n");
-		return NULL;
-	}
-
-	msg = cb_params->req;
-	if (msg == NULL) {
-		msg = cb_params->rpl;
-		if (msg == NULL || msg == FAKED_REPLY) {
-			return NULL;
-		}
-	}
-
-	return msg;
-}

+ 19 - 1
modules_k/dialog/dlg_cb.h

@@ -116,6 +116,24 @@ void run_load_callbacks( void );
  * \param cb_params dialog callback parameter struct
  * \return pointer to valid SIP message if existent, NULL otherwise
  */
-struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params);
+static inline struct sip_msg *dlg_get_valid_msg(struct dlg_cb_params *cb_params)
+{
+	struct sip_msg *msg;
+
+	if (cb_params == NULL) {
+		LM_ERR("no dialog parameters given\n");
+		return NULL;
+	}
+
+	msg = cb_params->req;
+	if (msg == NULL) {
+		msg = cb_params->rpl;
+		if (msg == NULL || msg == FAKED_REPLY) {
+			return NULL;
+		}
+	}
+
+	return msg;
+};
 
 #endif

+ 1 - 1
modules_k/pua_dialoginfo/pua_dialoginfo.c

@@ -130,7 +130,7 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 	}
 
 if (type != DLGCB_DESTROY) {
-	msg = get_valid_msg(_params);
+	msg = dlg_get_valid_msg(_params);
 	if (!msg) {
 		LM_ERR("no SIP message available in callback parameters\n");
 		return;