Module: kamailio Branch: master Commit: 0cb4dd3282ec12cdaefca491f9ed43acd0f21bdd URL: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43ac...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2025-05-20T09:25:09+02:00
dialog: split w_dlg_req_with_headers_and_content() for kemi usage
- PR #4245
---
Modified: src/modules/dialog/dialog.c
---
Diff: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43ac... Patch: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43ac...
---
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 382941c9925..4539d1657e2 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1363,19 +1363,57 @@ static int fixup_dlg_req_with_headers_and_content(void **param, int param_no) return 0; }
+static int ki_dlg_req_with_headers_and_content(struct sip_msg *msg, int nside, + str *smethod, str *sheaders, str *scontent_type, str *scontent) +{ + dlg_cell_t *dlg = NULL; + + dlg = dlg_get_ctx_dialog(); + if(dlg == NULL) + return -1; + + if(nside == 1) { + if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } else if(nside == 2) { + if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } else { + if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } + +done: + dlg_release(dlg); + return 1; + +error: + dlg_release(dlg); + return -1; +} + static int w_dlg_req_with_headers_and_content(struct sip_msg *msg, char *side, char *method, char *headers, char *content_type, char *content) { - dlg_cell_t *dlg = NULL; int n; str str_method = {0, 0}; str str_headers = {0, 0}; str str_content_type = {0, 0}; str str_content = {0, 0};
- dlg = dlg_get_ctx_dialog(); - if(dlg == NULL) - return -1;
if(fixup_get_svalue(msg, (gparam_p)method, &str_method) != 0) { LM_ERR("unable to get Method\n"); @@ -1417,36 +1455,11 @@ static int w_dlg_req_with_headers_and_content(struct sip_msg *msg, char *side, }
n = (int)(long)side; - if(n == 1) { - if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - } else if(n == 2) { - if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - } else { - if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - }
-done: - dlg_release(dlg); - return 1; + return ki_dlg_req_with_headers_and_content( + msg, n, &str_method, &str_headers, &str_content_type, &str_content);
error: - dlg_release(dlg); return -1; }
-
Daniel-Constantin Mierla