ims_registrar_pcscf: Re-Added the pcscf_unregister-function, aligned with latest changes

modules/ims_registrar_pcscf/reg_mod.c

@@ -117,6 +117,8 @@ static int w_reginfo_handle_notify(struct sip_msg* _m, char* _d, char* _foo);
 static int w_assert_identity(struct sip_msg* _m, char* _d, char* _preferred_uri);
 static int w_assert_called_identity(struct sip_msg* _m, char* _d, char* _foo);
 
+static int w_unregister(struct sip_msg* _m, char* _d, char* _aor, char* _received_host, char* _received_port);
+
 /*! \brief Fixup functions */
 static int domain_fixup(void** param, int param_no);
 static int save_fixup2(void** param, int param_no);
@@ -125,6 +127,7 @@ static int assert_identity_fixup(void ** param, int param_no);
 /* Pseudo-Variables */
 static int pv_get_asserted_identity_f(struct sip_msg *, pv_param_t *, pv_value_t *);
 static int pv_get_registration_contact_f(struct sip_msg *, pv_param_t *, pv_value_t *);
+static int unregister_fixup(void ** param, int param_no);
 
 /**
  * Update the time.
@@ -146,6 +149,7 @@ static cmd_export_t cmds[] = {
 	{"pcscf_assert_identity",       (cmd_function)w_assert_identity,        2,  	assert_identity_fixup,  0,REQUEST_ROUTE },
 	{"pcscf_assert_called_identity",(cmd_function)w_assert_called_identity, 1,      assert_identity_fixup,  0,ONREPLY_ROUTE },
 	{"reginfo_handle_notify",       (cmd_function)w_reginfo_handle_notify,  1,      domain_fixup,           0,REQUEST_ROUTE},
+        {"pcscf_unregister",		(cmd_function)w_unregister,		4,      unregister_fixup,       0,ANY_ROUTE},
 	{0, 0, 0, 0, 0, 0}
 };
 
@@ -475,3 +479,75 @@ pv_get_registration_contact_f(struct sip_msg *msg, pv_param_t *param,
 	if (ret_val != NULL) return pv_get_strval(msg, param, res, ret_val);
 	else return -1;
 }
+
+
+/*! \brief
+ * Fixup for "assert_identity" function - both domain and URI to be asserted
+ */
+static int unregister_fixup(void ** param, int param_no) {
+	if (param_no == 1) {
+		return domain_fixup(param,param_no);
+	} else {
+		pv_elem_t *model=NULL;
+		str s;
+
+		/* convert to str */
+		s.s = (char*)*param;
+		s.len = strlen(s.s);
+
+		model = NULL;
+		if(s.len==0) {
+			LM_ERR("no param!\n");
+			return E_CFG;
+		}
+		if(pv_parse_format(&s, &model)<0 || model==NULL) {
+			LM_ERR("wrong format [%s]!\n", s.s);
+			return E_CFG;
+		}
+		*param = (void*)model;
+		return 0;
+	}
+	return E_CFG;
+}
+
+
+static int w_unregister(struct sip_msg* _m, char* _d, char* _aor, char* _received_host, char* _received_port) {
+	pv_elem_t *model;
+	str aor;
+	str received_host;
+	str received_port;
+	int port = 0;
+
+	if ((_aor == NULL) || (_received_host == NULL) || (_received_port == NULL)) {
+		LM_ERR("error - bad parameters\n");
+		return -1;
+	}
+
+	model = (pv_elem_t*)_aor;
+	if (pv_printf_s(_m, model, &aor)<0) {
+		LM_ERR("error - cannot print the format\n");
+		return -1;
+	}
+	LM_DBG("URI: %.*s\n", aor.len, aor.s);
+
+	model = (pv_elem_t*)_received_host;
+	if (pv_printf_s(_m, model, &received_host)<0) {
+		LM_ERR("error - cannot print the format\n");
+		return -1;
+	}
+	LM_DBG("Received-Host: %.*s\n", received_host.len, received_host.s);
+
+	model = (pv_elem_t*)_received_port;
+	if (pv_printf_s(_m, model, &received_port)<0) {
+		LM_ERR("error - cannot print the format\n");
+		return -1;
+	}
+	LM_DBG("Received-Port: %.*s\n", received_port.len, received_port.s);
+	if (str2sint(&received_port, &port) != 0) {
+		LM_ERR("error - cannot convert %.*s to an int!\n", received_port.len, received_port.s);
+		return -1;
+	}
+
+	return pcscf_unregister((udomain_t*)_d, &aor, &received_host, port);
+}
+

modules/ims_registrar_pcscf/service_routes.c

@@ -627,3 +627,44 @@ error:
 	return ret;
 }
 
+int pcscf_unregister(udomain_t* _d, str * uri, str * received_host, int received_port) {
+	int result = -1;
+	struct pcontact * pcontact;
+	struct pcontact_info ci;
+    	memset(&ci, 0, sizeof (struct pcontact_info));
+
+	pcontact_info_t search_ci;
+	sip_uri_t contact_uri;
+        if (parse_uri(uri->s, uri->len, &contact_uri) != 0) {
+            LM_WARN("Failed to parse aor [%.*s]\n", uri->len, uri->s);
+            return -1;
+        }
+
+        search_ci.received_host.s = received_host->s;
+        search_ci.received_host.len = received_host->len;
+        search_ci.received_port = received_port;
+        search_ci.received_proto = contact_uri.proto? contact_uri.proto : PROTO_UDP;
+        search_ci.searchflag = SEARCH_RECEIVED;
+        search_ci.via_host.s = received_host->s;
+        search_ci.via_host.len = received_host->len;
+        search_ci.via_port = received_port;
+        search_ci.via_prot = search_ci.received_proto;
+        search_ci.aor.s = uri->s;
+        search_ci.aor.len = uri->len;
+
+	if (ul.get_pcontact(_d, &search_ci, &pcontact) == 0) {
+		/* Lock this record while working with the data: */
+		ul.lock_udomain(_d, &pcontact->via_host, pcontact->via_port, pcontact->via_proto);
+
+		LM_DBG("Updating contact [%.*s]: setting state to PCONTACT_DEREG_PENDING_PUBLISH\n", pcontact->aor.len, pcontact->aor.s);
+
+		ci.reg_state = PCONTACT_DEREG_PENDING_PUBLISH;
+		ci.num_service_routes = 0;
+		if (ul.update_pcontact(_d, &ci, pcontact) == 0) result = 1;
+
+		/* Unlock domain */
+		ul.unlock_udomain(_d, &pcontact->via_host, pcontact->via_port, pcontact->via_proto);
+	}
+	return result;
+}
+

modules/ims_registrar_pcscf/service_routes.h

@@ -61,4 +61,9 @@ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity);
  */
 int assert_called_identity(struct sip_msg* _m, udomain_t* _d);
 
+/**
+ * Unregister a contact
+ */
+int pcscf_unregister(udomain_t* _d, str * uri, str * received_host, int received_port);
+
 #endif /* SERVICE_ROUTES_H */