b2b_entities: new function: b2b_send_indlg_auth_req()

Author: ovidiusas

modules/b2b_entities/dlg.c

@@ -2323,6 +2323,75 @@ int b2b_send_indlg_req(b2b_dlg_t* dlg, enum b2b_entity_type et, str* b2b_key,
 	return -1;
 }
 
+static int build_extra_headers_from_msg(str buf, str *extra_hdr, str *new_hdrs, str *body);
+
+#define RETURN_GOTO_DONE     -2
+#define RETURN_GOTO_ERROR    -1
+#define RETURN_CONTINUE       0
+#define RETURN_GOTO_B2B_ROUTE 1
+
+int b2b_send_indlg_auth_req(int statuscode, struct authenticate_body *auth,
+							struct sip_msg * msg, struct cell *t,
+							b2b_dlg_t *dlg, enum b2b_entity_type etype, str* b2b_key)
+{
+	struct uac_credential* crd;
+	static struct authenticate_nc_cnonce auth_nc_cnonce;
+	struct digest_auth_response response;
+	str extra_headers = {NULL, 0};
+	str body = {NULL, 0};
+	str *new_hdr;
+	str msg_body;
+
+	crd = uac_auth_api._lookup_realm( &auth->realm );
+	if(crd)
+	{
+		if ((auth->flags & QOP_AUTH_INT) && get_body(msg, &msg_body) < 0) {
+			LM_ERR("Failed to get message body\n");
+			return RETURN_GOTO_DONE;
+		}
+		memset(&auth_nc_cnonce, 0,
+				sizeof(struct authenticate_nc_cnonce));
+		if (uac_auth_api._do_uac_auth(&msg_body, &t->method,
+				&t->uac[0].uri, crd, auth, &auth_nc_cnonce,
+				&response) != 0)
+		{
+			LM_ERR("failed in do_uac_auth()\n");
+			dlg->state = B2B_TERMINATED;
+			return RETURN_GOTO_ERROR;
+		}
+		new_hdr = uac_auth_api._build_authorization_hdr(statuscode,
+				&t->uac[0].uri, crd, auth,
+				&auth_nc_cnonce, &response);
+		if (!new_hdr)
+		{
+			LM_ERR("failed to build auth hdr\n");
+			dlg->state = B2B_TERMINATED;
+			return RETURN_GOTO_ERROR;
+		}
+		LM_DBG("auth is [%.*s]\n", new_hdr->len, new_hdr->s);
+		if (build_extra_headers_from_msg(t->uac[0].request.buffer,
+			new_hdr, &extra_headers, &body) < 0 ) {
+			LM_ERR("failed to build extra msgs after auth\n");
+			dlg->state = B2B_TERMINATED;
+			return RETURN_GOTO_ERROR;
+		}
+		LM_DBG("extra is [%.*s]\n",
+			extra_headers.len, extra_headers.s);
+		pkg_free(new_hdr->s);
+		new_hdr->s = NULL; new_hdr->len = 0;
+
+		b2b_send_indlg_req(dlg, etype, b2b_key, &t->method,
+				&extra_headers, 0, &body, 0);
+		pkg_free(extra_headers.s);
+
+		return RETURN_GOTO_B2B_ROUTE;
+	}
+	else
+		dlg->state = B2B_TERMINATED;
+
+	return RETURN_CONTINUE;
+}
+
 int _b2b_send_request(b2b_dlg_t* dlg, b2b_req_data_t* req_data)
 {
 	enum b2b_entity_type et = req_data->et;
@@ -2873,7 +2942,6 @@ static int build_extra_headers_from_msg(str buf, str *extra_hdr,
 void b2b_tm_cback(struct cell *t, b2b_table htable, struct tmcb_params *ps)
 {
 	struct sip_msg * msg;
-	str msg_body;
 	str* b2b_key;
 	unsigned int hash_index, local_index;
 	b2b_notify_t b2b_cback;
@@ -2885,8 +2953,6 @@ void b2b_tm_cback(struct cell *t, b2b_table htable, struct tmcb_params *ps)
 	dlg_leg_t* leg;
 	struct to_body* pto;
 	str to_tag, callid, from_tag;
-	str extra_headers = {NULL, 0};
-	str body = {NULL, 0};
 	struct hdr_field* hdr;
 	unsigned int method_id = 0;
 	struct cseq_body cb;
@@ -2895,11 +2961,7 @@ void b2b_tm_cback(struct cell *t, b2b_table htable, struct tmcb_params *ps)
 	int dlg_based_search = 0;
 	struct to_body to_hdr_parsed, from_hdr_parsed;
 	int dlg_state = 0, prev_state = B2B_UNDEFINED;
-	struct uac_credential* crd;
 	struct authenticate_body *auth = NULL;
-	static struct authenticate_nc_cnonce auth_nc_cnonce;
-	struct digest_auth_response response;
-	str *new_hdr;
 	char dummy_fl_buf[7/*SIP/2.0*/ + 1 + 3/*statuscode*/ + 1 + 7/*Timeout*/];
 	static str sdp_ct = str_init("Content-Type: application/sdp\r\n");
 	int old_route_type;
@@ -2912,6 +2974,7 @@ void b2b_tm_cback(struct cell *t, b2b_table htable, struct tmcb_params *ps)
 	unsigned int ua_flags = 0;
 	int ua_ev_type = -1;
 	int ua_auto_ack = 0;
+	int ret;
 
 	to_hdr_parsed.param_lst = from_hdr_parsed.param_lst = NULL;
 
@@ -3226,72 +3289,38 @@ void b2b_tm_cback(struct cell *t, b2b_table htable, struct tmcb_params *ps)
 					    DAUTH_AHFM_ANYSUP, &auth);
 					break;
 				}
+				ret = RETURN_CONTINUE;
 				if(auth)
+					ret = b2b_send_indlg_auth_req(statuscode, auth, msg, t, dlg, etype, b2b_key);
+				switch(ret)
 				{
-					crd = uac_auth_api._lookup_realm( &auth->realm );
-					if(crd)
-					{
-						if ((auth->flags & QOP_AUTH_INT) && get_body(msg, &msg_body) < 0) {
-							LM_ERR("Failed to get message body\n");
-							goto done;
-						}
-						memset(&auth_nc_cnonce, 0,
-								sizeof(struct authenticate_nc_cnonce));
-						if (uac_auth_api._do_uac_auth(&msg_body, &t->method,
-								&t->uac[0].uri, crd, auth, &auth_nc_cnonce,
-								&response) != 0)
-						{
-							LM_ERR("failed in do_uac_auth()\n");
-							dlg->state = B2B_TERMINATED;
-							B2BE_LOCK_RELEASE(htable, hash_index);
-							goto error;
-						}
-						new_hdr = uac_auth_api._build_authorization_hdr(statuscode,
-								&t->uac[0].uri, crd, auth,
-								&auth_nc_cnonce, &response);
-						if (!new_hdr)
-						{
-							LM_ERR("failed to build auth hdr\n");
-							dlg->state = B2B_TERMINATED;
-							B2BE_LOCK_RELEASE(htable, hash_index);
-							goto error;
-						}
-						LM_DBG("auth is [%.*s]\n", new_hdr->len, new_hdr->s);
-						if (build_extra_headers_from_msg(t->uac[0].request.buffer,
-							new_hdr, &extra_headers, &body) < 0 ) {
-							LM_ERR("failed to build extra msgs after auth\n");
-							dlg->state = B2B_TERMINATED;
-							B2BE_LOCK_RELEASE(htable, hash_index);
-							goto error;
-						}
-						LM_DBG("extra is [%.*s]\n",
-							extra_headers.len, extra_headers.s);
-						pkg_free(new_hdr->s);
-						new_hdr->s = NULL; new_hdr->len = 0;
-
-						b2b_send_indlg_req(dlg, etype, b2b_key, &t->method,
-								&extra_headers, 0, &body, 0);
-						pkg_free(extra_headers.s);
-
-						dlg->state = B2B_NEW_AUTH;
-						B2BE_LOCK_RELEASE(htable, hash_index);
-
-						/* run the b2b route */
-						if(ref_script_route_is_valid(reply_route_ref)) {
-							msg->flags = t->uac[0].br_flags;
-							swap_route_type(old_route_type, ONREPLY_ROUTE);
-							run_top_route(sroutes->request[reply_route_ref->idx], msg);
-							set_route_type(old_route_type);
-							b2b_apply_lumps(msg);
-						}
-						goto b2b_route;
-					}
-					else
-						dlg->state = B2B_TERMINATED;
-				}
-				else
-				{
+				case RETURN_GOTO_DONE:
+					goto done;
+					break;
+				case RETURN_GOTO_ERROR:
+					B2BE_LOCK_RELEASE(htable, hash_index);
+					goto error;
+					break;
+				case RETURN_CONTINUE:
 					dlg->state = B2B_TERMINATED;
+					break;
+				case RETURN_GOTO_B2B_ROUTE:
+					dlg->state = B2B_NEW_AUTH;
+					B2BE_LOCK_RELEASE(htable, hash_index);
+
+					/* run the b2b route */
+					if(ref_script_route_is_valid(reply_route_ref)) {
+						msg->flags = t->uac[0].br_flags;
+						swap_route_type(old_route_type, ONREPLY_ROUTE);
+						run_top_route(sroutes->request[reply_route_ref->idx], msg);
+						set_route_type(old_route_type);
+						b2b_apply_lumps(msg);
+					}
+					goto b2b_route;
+					break;
+				default:
+					LM_ERR("Unexpected return code [%d] from b2b_send_indlg_auth_req()\n", ret);
+					goto error;
 				}
 			}
 		}