usrloc: provide previous hop to UL_CONTACT_UPDATE

modules/mid_registrar/ulcb.c

@@ -222,7 +222,7 @@ static int unregister_record(urecord_t *r)
 	return send_unregister(from, to, ruri, callid, last_cseq, obp, ct);
 }
 
-void mid_reg_ct_event(void *binding, ul_cb_type type)
+void mid_reg_ct_event(void *binding, ul_cb_type type, ul_cb_extra *_)
 {
 	ucontact_t *c = (ucontact_t *)binding;
 	int_str_t *skip_dereg;
@@ -246,7 +246,7 @@ void mid_reg_ct_event(void *binding, ul_cb_type type)
 	}
 }
 
-void mid_reg_aor_event(void *binding, ul_cb_type type)
+void mid_reg_aor_event(void *binding, ul_cb_type type, ul_cb_extra *_)
 {
 	urecord_t *r = (urecord_t *)binding;
 	int_str_t *skip_dereg;

modules/mid_registrar/ulcb.h

@@ -28,7 +28,7 @@
 #ifndef __MID_REG_ULCB_
 #define __MID_REG_ULCB_
 
-void mid_reg_ct_event(void *binding, ul_cb_type type);
-void mid_reg_aor_event(void *binding, ul_cb_type type);
+void mid_reg_ct_event(void *binding, ul_cb_type type, ul_cb_extra *_);
+void mid_reg_aor_event(void *binding, ul_cb_type type, ul_cb_extra *_);
 
 #endif /* __MID_REG_ULCB_ */

modules/pua_bla/registrar_cb.c

@@ -32,7 +32,7 @@
 #include "pua_bla.h"
 
 
-void bla_contact_cb(void *binding, ul_cb_type type)
+void bla_contact_cb(void *binding, ul_cb_type type, ul_cb_extra *_)
 {
 	ucontact_t *c = (ucontact_t *)binding;
 	subs_info_t subs;

modules/pua_bla/registrar_cb.h

@@ -29,4 +29,4 @@
 #include "../../dprint.h"
 #include "../usrloc/usrloc.h"
 
-void bla_contact_cb(void *binding, ul_cb_type type);
+void bla_contact_cb(void *binding, ul_cb_type type, ul_cb_extra *_);

modules/pua_usrloc/pua_usrloc.h

@@ -26,7 +26,7 @@
 
 extern send_publish_t pua_send_publish;
 extern send_subscribe_t pua_send_subscribe;
-void ul_contact_publish(void *binding, ul_cb_type type);
+void ul_contact_publish(void *binding, ul_cb_type type, ul_cb_extra *_);
 int pua_set_publish(struct sip_msg* , char*, char*);
 
 extern str pres_prefix;

modules/pua_usrloc/ul_publish.c

@@ -188,7 +188,7 @@ str* build_pidf(ucontact_t* c)
 	return NULL;
 }
 
-void ul_contact_publish(void *binding, ul_cb_type type)
+void ul_contact_publish(void *binding, ul_cb_type type, ul_cb_extra *_)
 {
 	ucontact_t *c = (ucontact_t *)binding;
 	str* body= NULL;

modules/snmpstats/interprocess_buffer.c

@@ -141,7 +141,7 @@ int setInterprocessBuffersAlarm(void)
  * any race conditions between this function and the consumeInterprocessBuffer()
  * function.
  */
-void handleContactCallbacks(void *binding, ul_cb_type type)
+void handleContactCallbacks(void *binding, ul_cb_type type, ul_cb_extra *_)
 {
 	ucontact_t *contactInfo = (ucontact_t *)binding;
 	char *p;

modules/snmpstats/interprocess_buffer.h

@@ -99,7 +99,7 @@ int setInterprocessBuffersAlarm(void);
  * any race conditions between this function and the consumeInterprocessBuffer()
  * function.
  */
-void handleContactCallbacks(void *binding, ul_cb_type type);
+void handleContactCallbacks(void *binding, ul_cb_type type, ul_cb_extra *_);
 
 
 /* Interprocess Buffer consumption Function.  This function will iterate over

modules/usrloc/dlist.c

@@ -1208,7 +1208,7 @@ int delete_ucontact_from_coords(udomain_t *d, ucontact_coords ct_coords,
 		replicate_ucontact_delete(r, c, NULL);
 
 	if (exists_ulcb_type(UL_CONTACT_DELETE)) {
-		run_ul_callbacks( UL_CONTACT_DELETE, c);
+		run_ul_callbacks( UL_CONTACT_DELETE, c, NULL);
 	}
 
 	if (st_delete_ucontact(c) > 0) {

modules/usrloc/ucontact.c

@@ -967,11 +967,22 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci,
                     const struct ct_match *match, char skip_replication)
 {
 	int ret, persist_kv_store = 1;
+	ul_cb_extra extra;
+
+	memset(&extra, 0, sizeof extra);
+
+	if (exists_ulcb_type(UL_CONTACT_UPDATE)) {
+		extra.contact_update.prev_proto = _c->next_hop.proto;
+		extra.contact_update.prev_port = _c->next_hop.port;
+		pkg_str_dup(&extra.contact_update.prev_name, &_c->next_hop.name);
+	}
 
 	/* we have to update memory in any case, but database directly
 	 * only in sql_wmode SQL_WRITE_THROUGH */
 	if (mem_update_ucontact(_c, _ci) < 0) {
 		LM_ERR("failed to update memory\n");
+		if (extra.contact_update.prev_name.s)
+			pkg_free(extra.contact_update.prev_name.s);
 		return -1;
 	}
 
@@ -991,7 +1002,9 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci,
 	if (exists_ulcb_type(UL_CONTACT_UPDATE))
 	{
 		LM_DBG("exists callback for type= UL_CONTACT_UPDATE\n");
-		run_ul_callbacks( UL_CONTACT_UPDATE, _c);
+		run_ul_callbacks( UL_CONTACT_UPDATE, _c, &extra);
+		if (extra.contact_update.prev_name.s)
+			pkg_free(extra.contact_update.prev_name.s);
 	}
 
 	if (have_mem_storage())

modules/usrloc/udomain.c

@@ -1176,7 +1176,7 @@ int mem_timer_udomain(udomain_t* _d)
 			if (ptr->no_clear_ref <= 0 && ptr->contacts == NULL)
 			{
 				if (exists_ulcb_type(UL_AOR_EXPIRE))
-					run_ul_callbacks(UL_AOR_EXPIRE, ptr);
+					run_ul_callbacks(UL_AOR_EXPIRE, ptr, NULL);
 
 				if (location_cluster) {
 					if (cluster_mode == CM_FEDERATION_CACHEDB &&
@@ -1379,7 +1379,7 @@ int insert_urecord(udomain_t* _d, str* _aor, struct urecord** _r,
 	}
 
 	if (exists_ulcb_type(UL_AOR_INSERT))
-		run_ul_callbacks(UL_AOR_INSERT, *_r);
+		run_ul_callbacks(UL_AOR_INSERT, *_r, NULL);
 
 	return 0;
 }

modules/usrloc/ul_callback.h

@@ -46,6 +46,15 @@ typedef enum ul_cb_types {
 	ULCB_MAX              = ((1<<8)-1),
 } ul_cb_type;
 
+typedef union ul_cb_extra {
+	struct {
+		unsigned short prev_proto;
+		unsigned short prev_port;
+		str prev_name;
+	} contact_update;
+} ul_cb_extra;
+
+
 #define is_contact_cb(type) \
 	(type & \
 	(UL_CONTACT_INSERT|UL_CONTACT_UPDATE|UL_CONTACT_DELETE|UL_CONTACT_EXPIRE))
@@ -59,8 +68,9 @@ typedef enum ul_cb_types {
  * @binding: depending on the registered type,
  *             it should be casted to either (ucontact_t *) or (urecord_t *)
  * @type:    type of the callback
+ * @extra:   extra parameters provided for each type of callback
  */
-typedef void (ul_cb) (void *binding, ul_cb_type type);
+typedef void (ul_cb) (void *binding, ul_cb_type type, ul_cb_extra *extra);
 
 
 struct ul_callback {
@@ -103,7 +113,7 @@ int register_ulcb(ul_cb_type types, ul_cb f);
  *    - an (ucontact_t *) for contact callbacks
  *    - an (urecord_t *) for AoR callbacks
  */
-static inline void run_ul_callbacks(ul_cb_type type, void *binding)
+static inline void run_ul_callbacks(ul_cb_type type, void *binding, ul_cb_extra *extra)
 {
 	struct list_head *_;
 	struct ul_callback *cbp;
@@ -115,9 +125,9 @@ static inline void run_ul_callbacks(ul_cb_type type, void *binding)
 			       binding, type, cbp->types, cbp->id);
 
 			if (is_contact_cb(type)) {
-				cbp->callback(binding, type);
+				cbp->callback(binding, type, extra);
 			} else if (is_aor_cb(type)) {
-				cbp->callback(binding, type);
+				cbp->callback(binding, type, extra);
 			}
 		}
 	}

modules/usrloc/urecord.c

@@ -250,7 +250,7 @@ static inline int nodb_timer(urecord_t* _r)
 		if (!VALID_CONTACT(ptr, act_time)) {
 			/* run callbacks for EXPIRE event */
 			if (exists_ulcb_type(UL_CONTACT_EXPIRE))
-				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr);
+				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr, NULL);
 
 			LM_DBG("Binding '%.*s','%.*s' has expired\n",
 				ptr->aor->len, ZSW(ptr->aor->s),
@@ -284,7 +284,7 @@ static inline int ALLOW_UNUSED wt_timer(urecord_t* _r)
 		if (!VALID_CONTACT(ptr, act_time)) {
 			/* run callbacks for EXPIRE event */
 			if (exists_ulcb_type(UL_CONTACT_EXPIRE)) {
-				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr);
+				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr, NULL);
 			}
 
 			LM_DBG("Binding '%.*s','%.*s' has expired\n",
@@ -327,7 +327,7 @@ static inline int wb_timer(urecord_t* _r,query_list_t **ins_list)
 		if (!VALID_CONTACT(ptr, act_time)) {
 			/* run callbacks for EXPIRE event */
 			if (exists_ulcb_type(UL_CONTACT_EXPIRE)) {
-				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr);
+				run_ul_callbacks( UL_CONTACT_EXPIRE, ptr, NULL);
 			}
 
 			LM_DBG("Binding '%.*s','%.*s' has expired\n",
@@ -619,7 +619,7 @@ int cdb_flush_urecord(urecord_t *_r)
 		if (!VALID_CONTACT(ct, act_time)) {
 			/* run callbacks for DELETE event */
 			if (exists_ulcb_type(UL_CONTACT_DELETE))
-				run_ul_callbacks(UL_CONTACT_DELETE, ct);
+				run_ul_callbacks(UL_CONTACT_DELETE, ct, NULL);
 
 			LM_DBG("deleting AoR: %.*s, Contact: %.*s.\n",
 				ct->aor->len, ZSW(ct->aor->s),
@@ -827,7 +827,7 @@ void release_urecord(urecord_t* _r, char skip_replication)
 			return;
 
 		if (exists_ulcb_type(UL_AOR_DELETE))
-			run_ul_callbacks(UL_AOR_DELETE, _r);
+			run_ul_callbacks(UL_AOR_DELETE, _r, NULL);
 
 		if (!skip_replication && location_cluster) {
 			if (cluster_mode == CM_FEDERATION_CACHEDB &&
@@ -881,10 +881,10 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci,
 		replicate_ucontact_insert(_r, _contact, *_c, match);
 
 	if (exists_ulcb_type(UL_CONTACT_INSERT))
-		run_ul_callbacks(UL_CONTACT_INSERT, *_c);
+		run_ul_callbacks(UL_CONTACT_INSERT, *_c, NULL);
 
 	if (!first_contact && exists_ulcb_type(UL_AOR_UPDATE))
-		run_ul_callbacks(UL_AOR_UPDATE, _r);
+		run_ul_callbacks(UL_AOR_UPDATE, _r, NULL);
 
 	if (sql_wmode == SQL_WRITE_THROUGH) {
 		if (persist_urecord_kv_store(_r) != 0)
@@ -911,10 +911,10 @@ int delete_ucontact(urecord_t* _r, struct ucontact* _c,
 		replicate_ucontact_delete(_r, _c, match);
 
 	if (exists_ulcb_type(UL_CONTACT_DELETE))
-		run_ul_callbacks(UL_CONTACT_DELETE, _c);
+		run_ul_callbacks(UL_CONTACT_DELETE, _c, NULL);
 
 	if (exists_ulcb_type(UL_AOR_UPDATE))
-		run_ul_callbacks(UL_AOR_UPDATE, _r);
+		run_ul_callbacks(UL_AOR_UPDATE, _r, NULL);
 
 	LM_DBG("deleting contact '%.*s'\n", _c->c.len, _c->c.s);
 

modules/usrloc/usrloc.h

@@ -443,7 +443,7 @@ typedef struct usrloc_api {
 	 * Return: 0 (success), negative otherwise
 	 */
 	int (*register_ulcb) (ul_cb_type types,
-	                      void (*cb) (void *binding, ul_cb_type type));
+	                      void (*cb) (void *binding, ul_cb_type type, ul_cb_extra *extra));
 } usrloc_api_t;