- sr-dev - kamailio.org

git:master:0fae1026: pkg/kamailio/deb: version 5.9.0~dev1 [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0fae1026d49aa765b4451d2534972b57a2c09998 URL: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T08:59:53+02:00 pkg/kamailio/deb: version 5.9.0~dev1 [skip ci] reset debian/changelog for 5.9.x series --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5… Patch: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5…

1 0

git:master:39ca2874: Makefile.defs: version set to 5.9.0-dev1
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 39ca28748162e940bd91bf4e0cb0b1223b5f9138 URL: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T07:19:31+02:00 Makefile.defs: version set to 5.9.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Patch: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4165ca084fb..9feece65535 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:7bc702b7: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 7bc702b79bb07901c0925c9842b75ad3d818b4e1 URL: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-14T15:46:26+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Patch: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 4520bce8333..75f47f5f445 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -851,6 +851,7 @@ sht_rm_value_re("ha=>.*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables. @@ -869,6 +870,7 @@ sht_rm_name("ha", "re", ".*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables.

1 0

git:master:bb093505: htable: docs for sw operator for functions removing items
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: bb093505c5c5f625339f85961518f9db3fd6725d URL: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:41:31+02:00 htable: docs for sw operator for functions removing items --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Patch: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 69ad5e64581..c5cc20e22ed 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -910,6 +910,12 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -950,6 +956,12 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:29a890ff: htable: add ew (end-with) operator for delete items functions
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 29a890ffdcd394d26d53bd0951c7ca58262c7696 URL: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:29:57+02:00 htable: add ew (end-with) operator for delete items functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Patch: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 2391cb5c5d0..afda3dc6c54 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1033,7 +1033,7 @@ int ht_table_spec(char *spec) coldelim = tok.s[0]; LM_DBG("htable [%.*s] - coldelim [%c]\n", name.len, name.s, - coldelim); + coldelim); } else if(pit->name.len == 7 && strncmp(pit->name.s, "colnull", 7) == 0) { if(tok.len > 1) @@ -1045,8 +1045,7 @@ int ht_table_spec(char *spec) colnull = tok.s[0]; } - LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, - colnull); + LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, colnull); } else { goto error; } @@ -1383,7 +1382,15 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) && strncmp(it->name.s, sre->s, sre->len) == 0) { match = 1; } + } else if(op == HT_RM_OP_EW) { + if(sre->len <= it->name.len + && strncmp(it->name.s + it->name.len - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } } + } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1393,6 +1400,16 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_EW) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && strncmp(it->value.s.s + it->value.s.len + - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index e24a93b1f17..7c7642ef5df 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -124,6 +124,7 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_EQ 1 #define HT_RM_OP_NE 2 #define HT_RM_OP_SW 3 +#define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index bc5f18830be..7577e445a76 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -39,7 +39,8 @@ typedef enum HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_RM_CELL_SW + HT_DMQ_RM_CELL_SW, + HT_DMQ_RM_CELL_EW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 0fcd280de9c..6f775bb33ce 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -515,6 +515,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_EW, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_EW) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:master:671b874a: nghttp2: clear response headers on event route
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: 671b874a31fb10c6c9e9a246358928f202fc669d URL: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T21:24:54+02:00 nghttp2: clear response headers on event route --- Modified: src/modules/nghttp2/nghttp2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Patch: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f…

1 0

git:master:a368140d: nghttp2: fix typo in filed type
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: a368140d8d32a68ccc21845aad95e43c98a802d7 URL: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T08:58:20+02:00 nghttp2: fix typo in filed type --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Patch: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 8b343fd11ce..ac69a147313 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -79,7 +79,7 @@ typedef struct http2_stream_data char *request_path; char *request_pathfull; char *request_method; - ttp2_msghdr_t *hdrlist; + http2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:702e9cdb: nghttp2: structure to hold headers in stream data
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 702e9cdbe8c6ca5856c25f9737d77e3223bbf9ce URL: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: structure to hold headers in stream data --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Patch: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index cad3772d9ef..8b343fd11ce 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -66,12 +66,20 @@ struct app_context; typedef struct app_context app_context; +typedef struct http2_msghdr +{ + str name; + str value; + struct http2_msghdr *next; +} http2_msghdr_t; + typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; char *request_pathfull; char *request_method; + ttp2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:a8481f58: nghttp2: debug message instead of error on peer disconnect
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: a8481f588d5461285e512a0b68803ffc0f41d7b3 URL: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug message instead of error on peer disconnect --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Patch: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d5153bef0c6..d8c23220a13 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -221,7 +221,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - LM_ERR("%s disconnected\n", session_data->client_addr); + LM_DBG("remote peer %s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); }

1 0

git:master:11c5ed67: nghttp2: debug with data content
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 11c5ed679193c4cc94957c0a5948e07bfbfcfee9 URL: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug with data content --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Patch: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 8c17f847f87..d5153bef0c6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -560,6 +560,27 @@ static int on_frame_recv_callback( return 0; } +/* + * The implementation of nghttp2_on_data_chunk_recv_callback type. + * - function to get the received body. + */ +static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, + int32_t stream_id, const uint8_t *data, size_t len, void *user_data) +{ + struct Request *req; + (void)flags; + (void)user_data; + + req = nghttp2_session_get_stream_user_data(session, stream_id); + if(req) { + LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", + (unsigned long int)len); + LM_DBG("[[%.*s]]", (int)len, (char *)data); + LM_DBG("----------------------------\n"); + } + return 0; +} + static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id, uint32_t error_code, void *user_data) { @@ -587,6 +608,9 @@ static void initialize_nghttp2_session(http2_session_data *session_data) nghttp2_session_callbacks_set_on_frame_recv_callback( callbacks, on_frame_recv_callback); + nghttp2_session_callbacks_set_on_data_chunk_recv_callback( + callbacks, on_data_chunk_recv_callback); + nghttp2_session_callbacks_set_on_stream_close_callback( callbacks, on_stream_close_callback);

1 0

git:master:2b8d5877: nghttp2: added $nghttp2(pathfull) - full http path with all params
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 2b8d587713d96fbee31534b9b16f2c2b432e2e68 URL: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: added $nghttp2(pathfull) - full http path with all params --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Patch: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index 95918b1e6c8..c3e05e50b05 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -218,6 +218,14 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) goto error; } break; + case 8: + if(strncasecmp(in->s, "pathfull", 8) == 0) { + sp->pvp.pvn.u.isname.name.n = 6; + } else { + goto error; + } + break; + default: if(in->len > 2 && in->s[1] == ':' && (in->s[0] == 'h' || in->s[0] == 'H')) { @@ -275,6 +283,9 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.srcip); } return pv_get_null(msg, param, res); + case 6: /* pathfull */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.pathfull); + default: return pv_get_null(msg, param, res); } diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index dec339d7a15..8c17f847f87 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,7 +179,12 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); - free(stream_data->request_method); + if(stream_data->request_pathfull) { + free(stream_data->request_pathfull); + } + if(stream_data->request_method) { + free(stream_data->request_method); + } free(stream_data); } @@ -460,6 +465,7 @@ static int on_header_callback(nghttp2_session *session, for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + stream_data->request_pathfull = percent_decode(value, valuelen); } else if(namelen == sizeof(METHOD) - 1 && memcmp(METHOD, name, namelen) == 0) { if(stream_data->request_method) { diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 34e6155abfc..cad3772d9ef 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_pathfull; char *request_method; int32_t stream_id; int fd; @@ -100,6 +101,7 @@ typedef struct ksr_nghttp2_ctx int rplhdrs_n; str method; str path; + str pathfull; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] corex.list_sockets broken output (Issue #3799)
by sergey-safarov 11 Apr '24

11 Apr '24

### Description I found `corex.list_sockets` does not show the address family (`af`) properly But `core.sockets_list` properly shows the address family (`af`). ### Troubleshooting #### Reproduction Required to create a config file with content like ``` loadmodule "pv.so" loadmodule "ctl.so" loadmodule "corex.so" listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 request_route { drop; } ``` Start kamailio and then execute ```sh kamcmd corex.list_sockets ``` The output will be like ``` { af: unknown proto: udp name: 127.0.0.1 addrlist: { addr: 127.0.0.1 } port: 5060 sockstr: udp:127.0.0.1:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } { af: unknown proto: udp name: ::1 addrlist: { addr: ::1 } port: 5060 sockstr: udp:[::1]:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.9.0-dev0 (aarch64/linux) 206399 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 206399 compiled on 12:57:52 Mar 30 2024 with gcc 8.5.0 ``` * **Operating System**: ``` NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3799 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3799(a)github.com>

2 3

git:master:8bc64a9e: corex: Fix unknown af in list_sockets
by Xenofon Karamanos 11 Apr '24

11 Apr '24

Module: kamailio Branch: master Commit: 8bc64a9e6820243336387d9cd9acf81f24d89993 URL: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-11T14:11:03+03:00 corex: Fix unknown af in list_sockets --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Patch: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index fa553fbf911..90f2e124125 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -61,8 +61,8 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) return; } - if(rpc->struct_add(th, "sss{", "af", get_af_name(proto), "proto", - get_valid_proto_name(proto), "name", si->name.s, + if(rpc->struct_add(th, "sss{", "af", get_af_name(si->address.af), + "proto", get_valid_proto_name(proto), "name", si->name.s, "addrlist", &ih) < 0) { rpc->fault(ctx, 500, "Internal error address list structure");

1 0

[kamailio/kamailio] corex: Fix unknown af in list_sockets rpc call (PR #3811)
by Xenofon Karamanos 11 Apr '24

11 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3799 #### Description  This PR fixes the unknown address family when calling `corex.list_sockets` rpc call by providing the correct argument (address.af) to `get_af_name()` instead of proto. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3811 -- Commit Summary -- * corex: Fix unknown af in list_sockets -- File Changes -- M src/modules/corex/corex_rpc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3811.patch https://github.com/kamailio/kamailio/pull/3811.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3811 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3811(a)github.com>

1 1

git:master:9a43631e: nghttp2: store method in stream data
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 9a43631e1707490c0781f9d2d10055663ebcde44 URL: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T08:07:30+02:00 nghttp2: store method in stream data --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Patch: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 38ae3673d46..dec339d7a15 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,6 +179,7 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); + free(stream_data->request_method); free(stream_data); } @@ -436,6 +437,7 @@ static int on_header_callback(nghttp2_session *session, { http2_stream_data *stream_data; const char PATH[] = ":path"; + const char METHOD[] = ":method"; (void)flags; (void)user_data; @@ -446,15 +448,25 @@ static int on_header_callback(nghttp2_session *session, } stream_data = nghttp2_session_get_stream_user_data( session, frame->hd.stream_id); - if(!stream_data || stream_data->request_path) { + if(!stream_data) { break; } if(namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) { size_t j; + if(stream_data->request_path) { + break; + } for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + } else if(namelen == sizeof(METHOD) - 1 + && memcmp(METHOD, name, namelen) == 0) { + if(stream_data->request_method) { + break; + } + stream_data->request_method = + strndup((const char *)value, valuelen); } break; } @@ -497,8 +509,15 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.path.s = stream_data->request_path; _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); - _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; - _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + if(stream_data->request_method) { + _ksr_nghttp2_ctx.method.s = stream_data->request_method; + _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } + + if(session_data->client_addr) { + _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; + _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } ksr_event_route(); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index bb5e446631c..34e6155abfc 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_method; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:7fb51562: nghttp2: $nghttp2(url) replaced with $nghttp2(path)
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 7fb51562233c8b94a4bb38e4bcb8c7529937ed9e URL: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T07:31:18+02:00 nghttp2: $nghttp2(url) replaced with $nghttp2(path) - match corresponding http2 header name --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Patch: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index de7a13485bf..95918b1e6c8 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -186,15 +186,10 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; switch(in->len) { - case 3: - if(strncasecmp(in->s, "url", 3) == 0) { - sp->pvp.pvn.u.isname.name.n = 0; - } else { - goto error; - } - break; case 4: - if(strncasecmp(in->s, "data", 4) == 0) { + if(strncasecmp(in->s, "path", 4) == 0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncasecmp(in->s, "data", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 1; } else if(strncasecmp(in->s, "size", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 2; @@ -264,8 +259,8 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } switch(param->pvn.u.isname.name.n) { - case 0: /* url */ - return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.url); + case 0: /* path */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.path); case 1: /* data */ return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.data); case 2: /* size */ diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 46b4e003462..38ae3673d46 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -494,8 +494,8 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.session_data = session_data; _ksr_nghttp2_ctx.stream_data = stream_data; - _ksr_nghttp2_ctx.url.s = stream_data->request_path; - _ksr_nghttp2_ctx.url.len = strlen(_ksr_nghttp2_ctx.url.s); + _ksr_nghttp2_ctx.path.s = stream_data->request_path; + _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index dc1f5f148c6..bb5e446631c 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -98,7 +98,7 @@ typedef struct ksr_nghttp2_ctx nghttp2_nv rplhdrs_v[KSR_NGHTTP2_RPLHDRS_SIZE]; int rplhdrs_n; str method; - str url; + str path; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] User id conflict between kamctl et. al. and Linux OS installations (Issue #3752)
by Mark Warren 10 Apr '24

10 Apr '24

### Description After installing kamailio on Ubuntu (20.04 and 22.04) using normal kamailio.org instructions, things work fine. However, a developer is working on a large project as root, and occasionally restarts kamailio with the command "kamctl <start|stop|restart>", rather than the OS command "systemctl <stop|start|restart> kamailio". After that, any attempt to restart or check status using systmectl fails, and rebooting the server occasionally fails to restart kamailio. ### Troubleshooting #### Reproduction Install ubuntu 22.04 or 20.04. When up and running, try this: `systemctl status kamailio` (everything looks good) `ps -C kamailio -o comm,uid,euid,pid,ppid` (all happy, Kamailio running as user kamailio) `kamctl restart` `ps -C kamailio -o comm,uid,euid,pid,ppid` (Yes it's running, but as root, not kamailio) `systemctl status kamailio` (FAILS, 20.04 reports "Failed to start", 22.04 reports "kamailio.service: Deactivated successfully") `systemctl restart kamailio` (FAILS - same reports as preceding "status" command) #### Debugging Data  #### Log Messages  After command systemctl restart kamailio: ``` Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/tcp_main.c:5042]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nc_enabled) support disabled Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [main.c:2779]: main(): processes (at least): 32 - shm size: 67108864 - pkg size: 8388608 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: ERROR: <core> [core/tcp_main.c:3162]: tcp_init(): bind(c, 0x7f49b0475c74, 16) on 127.0.0.1:5060 : Address already in use Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Modify kamctl et. al. to call systemctl for start, stop, restart commands. Alternatively have kamctl call setuid() before start, restart, stop commands. ### Additional Information * **Kamailio Version** - output of `kamailio -v` On ubuntu 20.04: ``` version: kamailio 5.3.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 9.2.1 ``` For ubuntu 22.04: ``` version: kamailio 5.6.5 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` * **Operating System**: For ubuntu 22.04: ``` root@my_22.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.04.3 LTS Release: 22.04 Codename: jammy root@my_22.04_ubuntu:~# uname -a Linux my_22.04_ubuntu 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_22.04_ubuntu:~# ``` For ubuntu 20.04 ``` root@my_20.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal root@my_20.04_ubuntu:~# uname -a Linux my_20.04_ubuntu 5.4.0-171-generic #189-Ubuntu SMP Fri Jan 5 14:23:02 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_20.04_ubuntu:~# ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3752 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3752(a)github.com>

3 3

git:master:2da9ed93: Makefile.groups: added group for nghttp2 module
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 2da9ed9395ef04f889f4594753fc5f4cf7a75b29 URL: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:28:25+02:00 Makefile.groups: added group for nghttp2 module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Patch: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index fec21d47bdd..ee514014be2 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -235,6 +235,9 @@ mod_list_ruxc=ruxc # - modules depending on microhttpd library mod_list_microhttpd=microhttpd +# - modules depending on nghttp2 library +mod_list_nghttp2=nghttp2 + # - modules depending on libgcrypt library mod_list_gcrypt=gcrypt @@ -288,6 +291,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_tlsa) \ $(mod_list_tls_wolfssl) \ $(mod_list_microhttpd) \ + $(mod_list_nghttp2) \ $(mod_list_gcrypt) \ $(mod_list_rtp_media_server) @@ -542,6 +546,9 @@ module_group_kruxc=$(mod_list_ruxc) # K microhttpd module module_group_kmicrohttpd=$(mod_list_microhttpd) +# K nghttp2 module +module_group_knghttp2=$(mod_list_nghttp2) + # K gcrypt module module_group_kgcrypt=$(mod_list_gcrypt)

1 0

git:master:5655ded5: modules: readme files regenerated - nghttp2 ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5655ded56eed50f743d2a60cb4c27c2c5b8dbd4b URL: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T19:31:21+02:00 modules: readme files regenerated - nghttp2 ... [skip ci] --- Modified: src/modules/nghttp2/README --- Diff: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Patch: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… --- diff --git a/src/modules/nghttp2/README b/src/modules/nghttp2/README index 21c296ca0a3..f880b2e5a13 100644 --- a/src/modules/nghttp2/README +++ b/src/modules/nghttp2/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -43,6 +44,7 @@ Daniel-Constantin Mierla 1.2. Set listen_port parameter 1.3. Set event_callback parameter 1.4. nghttp2_reply usage + 1.5. nghttp2_reply usage Chapter 1. Admin Guide @@ -62,7 +64,8 @@ Chapter 1. Admin Guide 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -87,7 +90,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libnghttp2 - libnghttpd library (v1.61.0+) + * libnghttp2 - libnghttpd library (v1.43.0+) 3. Parameters @@ -142,16 +145,32 @@ end 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) -4.1. nghttp2_reply(code, reason, ctype, body) +4.1. nghttp2_reply(code, body) - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both + parameters can contain variables. Example 1.4. nghttp2_reply usage ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... + +4.2. nghttp2_reply_header(name, value) + + Set a header to be added to reply. There can be up to 15 headers. + + Example 1.5. nghttp2_reply usage +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:3439eb44: nghttp2: docs for nghttp2_reply_header(...) function
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 3439eb44087b044cb9caaaf8af8df155d6a42bba URL: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:15:32+02:00 nghttp2: docs for nghttp2_reply_header(...) function --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Patch: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 4589bc145fe..54cde446de6 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -129,17 +129,39 @@ end <title>Functions</title> <section id="nghttp2.f.nghttp2_reply"> <title> - <function moreinfo="none">nghttp2_reply(code, reason, ctype, body)</function> + <function moreinfo="none">nghttp2_reply(code, body)</function> </title> <para> - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both parameters + can contain variables. </para> <example> <title><function>nghttp2_reply</function> usage</title> <programlisting format="linespecific"> ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... +</programlisting> + </example> + </section> + <section id="nghttp2.f.nghttp2_reply_header"> + <title> + <function moreinfo="none">nghttp2_reply_header(name, value)</function> + </title> + <para> + Set a header to be added to reply. There can be up to 15 headers. + </para> + <example> + <title><function>nghttp2_reply</function> usage</title> + <programlisting format="linespecific"> +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:ec847027: nghttp2: separate function for setting response headers
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: ec847027effacb0f7003a3b12ff33017e10dc0c1 URL: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:10:57+02:00 nghttp2: separate function for setting response headers --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Patch: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301…

1 0

git:master:f3a5fb51: nghttp2: convert to debug messages
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: f3a5fb519d1e6a6670e44175332dc7889f8fb99e URL: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:21:40+02:00 nghttp2: convert to debug messages --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Patch: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 075ff6e0b23..bdbec4a8c58 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -240,7 +240,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - fprintf(stderr, "%s disconnected\n", session_data->client_addr); + LM_ERR("%s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); } @@ -517,8 +517,7 @@ static int on_request_recv(nghttp2_session *session, } return 0; } - fprintf(stderr, "%s GET %s\n", session_data->client_addr, - stream_data->request_path); + LM_DBG("%s GET %s\n", session_data->client_addr, stream_data->request_path); if(!check_path(stream_data->request_path)) { if(error_reply(session, stream_data) != 0) { return NGHTTP2_ERR_CALLBACK_FAILURE; @@ -676,7 +675,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) SSL *ssl; (void)bev; - fprintf(stderr, "%s connected\n", session_data->client_addr); + LM_DBG("%s connected\n", session_data->client_addr); ssl = bufferevent_openssl_get_ssl(session_data->bev); @@ -690,8 +689,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) #endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */ if(alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) { - fprintf(stderr, "%s h2 is not negotiated\n", - session_data->client_addr); + LM_DBG("%s h2 is not negotiated\n", session_data->client_addr); delete_http2_session_data(session_data); return; } @@ -707,11 +705,11 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) return; } if(events & BEV_EVENT_EOF) { - fprintf(stderr, "%s EOF\n", session_data->client_addr); + LM_DBG("%s EOF\n", session_data->client_addr); } else if(events & BEV_EVENT_ERROR) { - fprintf(stderr, "%s network error\n", session_data->client_addr); + LM_DBG("%s network error\n", session_data->client_addr); } else if(events & BEV_EVENT_TIMEOUT) { - fprintf(stderr, "%s timeout\n", session_data->client_addr); + LM_DBG("%s timeout\n", session_data->client_addr); } delete_http2_session_data(session_data); }

1 0

git:master:20fd1c44: nghttpd2: docs - update required libnghttp2 version
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 20fd1c44916f45b7dec6253f6f105aa606839281 URL: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:18:05+02:00 nghttpd2: docs - update required libnghttp2 version --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Patch: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 80465a7a49c..4589bc145fe 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -43,7 +43,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.61.0+) + <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.43.0+) </para> </listitem> </itemizedlist>

1 0

git:master:6333db8f: nghttp2: compatibility with older libnghttp2 versions
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 6333db8fb19bd8684476914b3fe4d3ebda36940a URL: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: compatibility with older libnghttp2 versions --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Patch: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e…

1 0

git:master:740b73e6: nghttp2: Makefile - link with additional libraries
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 740b73e6dd174f2946e29cfc00c2a72063fd6645 URL: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: Makefile - link with additional libraries --- Modified: src/modules/nghttp2/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Patch: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… --- diff --git a/src/modules/nghttp2/Makefile b/src/modules/nghttp2/Makefile index d6b2dd84674..f71ba0c3556 100644 --- a/src/modules/nghttp2/Makefile +++ b/src/modules/nghttp2/Makefile @@ -38,7 +38,55 @@ else LEVENTLIBS = $(shell $(LEVENT_BUILDER) --libs) endif -DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) -LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) + +ifeq ($(CROSS_COMPILE),) +LEVENTSSL_BUILDER = $(shell \ + if pkg-config --exists libevent_openssl; then \ + echo 'pkg-config libevent_openssl'; \ + fi) +endif + +ifeq ($(LEVENTSSL_BUILDER),) + LEVENTSSLDEFS=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LEVENTSSLLIBS=-L$(LOCALBASE)/lib -levent_openssl +else + LEVENTSSLDEFS = $(shell $(LEVENTSSL_BUILDER) --cflags) + LEVENTSSLLIBS = $(shell $(LEVENTSSL_BUILDER) --libs) +endif + + +ifeq ($(CROSS_COMPILE),) +LSSL_BUILDER=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) +LCRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) +endif + +ifneq ($(LSSL_BUILDER),) + LSSLDEFS = $(shell $(LSSL_BUILDER) --cflags) + LSSLLIBS = $(shell $(LSSL_BUILDER) --libs) + +ifneq ($(CRYPTO_BUILDER),) + LCRYPTODEFS = $(shell $(LCRYPTO_BUILDER) --cflags) + LCRYPTOLIBS = $(shell $(LCRYPTO_BUILDER) --libs) +endif + +else + LSSLDEFS = -I$(LOCALBASE)/ssl/include + LSSLLIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl -lcrypto + LCRYPTODEFS = + LCRYPTOLIBS = +endif + + + +DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) $(LEVENTSSLDEFS) $(LSSLDEFS) $(LCRYPTODEFS) +LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) $(LEVENTSSLLIBS) $(LSSLLIBS) $(LCRYPTOLIBS) include ../../Makefile.modules

1 0

git:master:9d3759c5: modules: readme files regenerated - ipops ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9d3759c5fcf38c842285dc2f6a700f7bb4cea740 URL: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T12:46:25+02:00 modules: readme files regenerated - ipops ... [skip ci] --- Modified: src/modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Patch: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7…

1 0

[kamailio/kamailio] Add PRT query support to ipops module (PR #3802)
by Xenofon Karamanos 09 Apr '24

09 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to add support for PRT queries in ipops module. Some functions were modified to accommodate and reuse the structures already defined for DNS. Any feedback is appreciated! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3802 -- Commit Summary -- * ipops: Move structures to header * ipops: Add PTR query support -- File Changes -- M src/modules/ipops/ipops_mod.c (30) M src/modules/ipops/ipops_pv.c (162) M src/modules/ipops/ipops_pv.h (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3802.patch https://github.com/kamailio/kamailio/pull/3802.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3802 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3802(a)github.com>

4 30

git:master:5a5b96c8: ipops: Add KEMI wrapper for ptr_query function
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5a5b96c8a1906b45873e50243f5946b8db5a068b URL: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add KEMI wrapper for ptr_query function --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Patch: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 60fd514d4fb..ea82beb0867 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1333,6 +1333,14 @@ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) return ptr_update_pv(&ip_address, &name); } +/** + * \brief KEMI wrapper for `ptr_query` function. + */ +static int ki_ptr_query(sip_msg_t *msg, str *ip, str *pvid) +{ + return ptr_update_pv(ip, pvid); +} + /** * */ @@ -1513,6 +1521,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("ptr_query"), + SR_KEMIP_INT, ki_ptr_query, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("ipops"), str_init("srv_query"), SR_KEMIP_INT, ki_srv_query, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:812ad6eb: ipops: Add brief comment for ptr_query
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 812ad6eb4e49426197e2860b89b255fffb018b5a URL: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add brief comment for ptr_query --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Patch: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index ea2669d2a19..60fd514d4fb 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1298,7 +1298,18 @@ static int ki_dns_query(sip_msg_t *msg, str *naptrname, str *pvid) } /** + *! \brief Return 1 (true) if the given `ip` IP address (string or pv) + * could successfully be resolved to a domain and saved into `pv_name` pv. + * Otherwise, return negative values depending on the error. * + * \param[in] msg SIP message structure. + * \param[in] ip IP address (string or pv) to resolve. + * \param[in] pv_name PV name to save the resolved domain. + * \returns 1 on success. + * \returns negative values depending on the error: + * \retval 1 success. + * \retval res -1 to -5 for bad input. + * \retval -6 for error in resolving the domain. */ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 10447e84bcd..034ec696594 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -413,8 +413,16 @@ int dns_update_pv(str *hostname, str *name) return 1; } -/* -* +/** + * \brief Updates the pointer (PTR) record for a given IP address and saves it into pv. + * + * \details This function updates the PTR record for a specified IP address, and saves it + * into `name` AVP encapsulated in $ptrquery pv. + * It performs a reverse DNS lookup to obtain the hostname corresponding to the IP address. + * + * @param ip_address The IP address to update the PTR record for. + * @param name The name of AVP to hold the information in $ptrquery pv. + * @return 1 on success, or a negative value on failure. */ int ptr_update_pv(str *ip_address, str *name) {

1 0

git:master:a824e939: ipops: Add ptr_query docs
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: a824e939b589ae595fc735de1337a8bf4470de20 URL: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add ptr_query docs --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Patch: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index 14dad9f5df6..912d953c9fe 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -883,6 +883,93 @@ if(dns_query("test.com", "xyz")) </section> + <section id="ipops.f.ptr_query"> + <title> + <function moreinfo="none">ptr_query(ip, pvid)</function> + </title> + + <para> + Store the hostname that correspond to an IP address (IPv4 or IPv6) + in a pseudo-variable variable $ptrquery(pvid=>hostname). + </para> + + <para> + <emphasis>Note: Results will be in in $ptrquery(pvid=>key).</emphasis> + key can be: + <itemizedlist> + <listitem> + <para> + <emphasis>addr</emphasis> - IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>type</emphasis> - type of IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv4</emphasis> - 1 if IPv4 address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv6</emphasis> - 1 if IPv6 address + </para> + </listitem> + <listitem> + <para> + <emphasis>count</emphasis> - number of hostnames found + </para> + </listitem> + <listitem> + <para> + <emphasis>hostname</emphasis> - hostname + </para> + </listitem> + </itemizedlist> + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>ip</emphasis> - string or pseudo-variable containing the ip. + </para> + </listitem> + <listitem> + <para> + <emphasis>pvid</emphasis> - AVP id for script variable. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>ptr_query</function> usage + </title> + <programlisting format="linespecific"> +... +if(ptr_query("8.8.8.8","ip4")) +{ + xlog(" number of names: $ptrquery(ip4=>count)\n"); + $var(j) = 0; + while($var(j)<$ptrquery(ip4=>count)) { + xlog(" #[$var(j)] name [ $ptrquery(ip4=>hostname) ]\n"); + $var(j) = $var(j) + 1; + } +} +... + </programlisting> + </example> + + </section> + <section id="ipops.f.srv_query"> <title> <function moreinfo="none">srv_query(srvcname, pvid)</function>

1 0

git:master:4c775edd: ipops: Add PTR query support
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 4c775eddaf76cbaf376bfb2d0e5efc78d0d60dc4 URL: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add PTR query support --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Patch: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7…

1 0

git:master:9181ee56: ipops: Move structures to header
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9181ee56e8e90845982a5d994b96917c1e03d059 URL: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Move structures to header --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Patch: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index c6374b6ab7c..6769d1863c7 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -35,38 +35,8 @@ #include "../../core/resolve.h" #include "../../core/pvar.h" +#include "ipops_pv.h" -#define PV_DNS_ADDR 64 -#define PV_DNS_RECS 32 - -typedef struct _sr_dns_record -{ - int type; - char addr[PV_DNS_ADDR]; -} sr_dns_record_t; - -typedef struct _sr_dns_item -{ - str name; - unsigned int hashid; - char hostname[256]; - int count; - int ipv4; - int ipv6; - sr_dns_record_t r[PV_DNS_RECS]; - struct _sr_dns_item *next; -} sr_dns_item_t; - -#define SR_DNS_PVIDX 1 - -typedef struct _dns_pv -{ - sr_dns_item_t *item; - int type; - int flags; - pv_spec_t *pidx; - int nidx; -} dns_pv_t; static sr_dns_item_t *_sr_dns_list = NULL; diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 8b6642ce3a8..f62e4e52e5e 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -24,6 +24,35 @@ #define _IPOPS_PV_H_ #include "../../core/pvar.h" +#define PV_DNS_ADDR 64 +#define PV_DNS_RECS 32 +#define SR_DNS_PVIDX 1 + +typedef struct _sr_dns_record +{ + int type; + char addr[PV_DNS_ADDR]; +} sr_dns_record_t; +typedef struct _sr_dns_item +{ + str name; + unsigned int hashid; + char hostname[256]; + int count; + int ipv4; + int ipv6; + sr_dns_record_t r[PV_DNS_RECS]; + struct _sr_dns_item *next; +} sr_dns_item_t; + +typedef struct _dns_pv +{ + sr_dns_item_t *item; + int type; + int flags; + pv_spec_t *pidx; + int nidx; +} dns_pv_t; int pv_parse_dns_name(pv_spec_t *sp, str *in); int pv_get_dns(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a7e02a40: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: a7e02a406a0ecec5434fc634149dfc8f61043b2f URL: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-08T21:31:24+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Patch: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 844a6cf3107..57ae0972735 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -78,6 +78,7 @@ Hugh Waite 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -141,6 +142,7 @@ Hugh Waite 1.29. http_client_request() usage 1.30. http_client_request_v2pk() usage 1.31. http_client_response_headers_set() usage + 1.32. http_client_response_headers_clear() usage Chapter 1. Admin Guide @@ -188,6 +190,7 @@ Chapter 1. Admin Guide 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -732,6 +735,7 @@ modparam("http_client", "response_headers", 1) 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 4.1. http_connect(connection, url, [content_type, data,] result) @@ -951,6 +955,20 @@ ram})&f_uri=$(fu{s.escape.param})", xinfo("response header: $httprhdr(X-Header)\n"); ... +4.9. http_client_response_headers_clear() + + Clear stored response headers, if not explicitely done, it happens when + the next HTTP request is performed. + + Example 1.32. http_client_response_headers_clear() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); +... + 5. Pseudo-Variables 5.1. $curlerror(error)

1 0

git:master:5ba76f65: nghttp2: new module for supporting direct http2 connections
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 5ba76f65f5c2ea522a2e6629bd845918258a80cf URL: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T21:25:11+02:00 nghttp2: new module for supporting direct http2 connections - initial import version --- Added: src/modules/nghttp2/Makefile Added: src/modules/nghttp2/README Added: src/modules/nghttp2/doc/Makefile Added: src/modules/nghttp2/doc/nghttp2.xml Added: src/modules/nghttp2/doc/nghttp2_admin.xml Added: src/modules/nghttp2/nghttp2_mod.c Added: src/modules/nghttp2/nghttp2_server.c Added: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Patch: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591…

1 0

git:master:d55cd7e6: http_client: docs for http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: d55cd7e613c787ce0dd91abad036d4ecd7556023 URL: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T17:03:19+02:00 http_client: docs for http_client_response_headers_clear() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Patch: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 0a8f147eb0e..e81d912c11e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1047,6 +1047,26 @@ http_client_response_headers_set("1"); http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); xinfo("response header: $httprhdr(X-Header)\n"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_clear"> + <title> + <function moreinfo="none">http_client_response_headers_clear()</function> + </title> + <para> + Clear stored response headers, if not explicitely done, it happens + when the next HTTP request is performed. + </para> + <example> + <title><function>http_client_response_headers_clear()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); ... </programlisting> </example>

1 0

git:master:cdf0633b: http_client: added http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: cdf0633b6b51bbfb7eb785715358c88aeb4c6a40 URL: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T14:14:58+02:00 http_client: added http_client_response_headers_clear() - clear response headers - if not explicitely done, it happens when next http request is performed --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Patch: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c8af2f64901..27310829d0e 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -160,6 +160,8 @@ static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_client_response_headers_set( sip_msg_t *_m, char *_pval, char *_p2); +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_p1, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -205,6 +207,9 @@ static cmd_export_t cmds[] = { {"http_client_response_headers_set", (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"http_client_response_headers_clear", + (cmd_function)w_http_client_response_headers_clear, 1, 0, + 0, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1184,6 +1189,16 @@ static int w_http_client_response_headers_set( return ki_http_client_response_headers_set(_m, ival); } +/*! + * + */ +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_pval, char *_p2) +{ + http_client_response_headers_reset(); + return 1; +} + /*! * Parse arguments to pv $curlerror */

1 0

git:5.8:215af598: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.8 Commit: 215af59832efc6e485563b55e3af9d209121d0c5 URL: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:47:20+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Patch: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.7:46cf3559: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.7 Commit: 46cf3559f4847b00790c043de41699b6c16f4920 URL: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:54+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Patch: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.6:2a6f18aa: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.6 Commit: 2a6f18aaf08d87c71c530a14ebae17d211ae8a25 URL: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:21+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Patch: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:60ded00a: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 60ded00a3b574a08457a696334d11d668595cc0b URL: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T11:35:38+03:00 pdb server: allow carrier id 0 --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Patch: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:1b01ecfe: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 1b01ecfe0b4e9bbba62afae0f3a3bb1612cdffcd URL: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-07T16:01:35+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Patch: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1…

1 0

git:master:b3562c6b: http_client: docs for http_client_response_headers_set()
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: b3562c6b10accec829a15c25fd56e53c8c89a87e URL: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T15:50:33+02:00 http_client: docs for http_client_response_headers_set() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Patch: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6424582074c..0a8f147eb0e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1026,6 +1026,27 @@ http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_set"> + <title> + <function moreinfo="none">http_client_response_headers_set(mode)</function> + </title> + <para> + Set if the HTTP response header should be stored (when mode is 1) + or not (when mode is 0). If mode is 0, then it also clears previously + stored response headers. + </para> + <example> + <title><function>http_client_response_headers_set()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_response_headers_set("1"); +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); ... </programlisting> </example>

1 0

git:master:00198b8d: http_client: added http_client_response_headers_set(mode)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 00198b8d863a94ea593b7473c88c35e6cad67014 URL: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:41:22+02:00 http_client: added http_client_response_headers_set(mode) - control if http response header should be set or not --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Patch: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 4bea581d50f..c8af2f64901 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -158,6 +158,8 @@ static int w_http_query_request(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -200,6 +202,9 @@ static cmd_export_t cmds[] = { {"http_get_redirect", (cmd_function)w_curl_get_redirect, 2, fixup_curl_get_redirect, fixup_free_curl_get_redirect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"http_client_response_headers_set", + (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1149,6 +1154,36 @@ static int w_http_query_request(sip_msg_t *_m, char *_met, char *_url, return ki_http_request_helper(_m, &met, &url, &body, &hdrs, 0, dst); } +/*! + * + */ +static int ki_http_client_response_headers_set(sip_msg_t *_m, int ival) +{ + if(ival == 0) { + http_client_response_headers_reset(); + http_client_response_headers_param = 0; + } else { + http_client_response_headers_param = 1; + } + + return 1; +} + +/*! + * + */ +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2) +{ + int ival = 0; + + if(fixup_get_ivalue(_m, (gparam_t *)_pval, &ival) < 0) { + LM_ERR("failed to get parameter value\n"); + return -1; + } + return ki_http_client_response_headers_set(_m, ival); +} + /*! * Parse arguments to pv $curlerror */

1 0

git:master:fdb9c938: http_client: docs for $httprhdr(name)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: fdb9c938639b3fea29b8c1ba6e6e412a5da8a7f3 URL: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:27:11+02:00 http_client: docs for $httprhdr(name) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Patch: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index f5eb42f7b91..6424582074c 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -716,7 +716,8 @@ modparam("http_client", "netinterface", "eth0") <section id="http_client.p.response_headers"> <title><varname>response_headers</varname> (int)</title> <para> - Set to 1 in order to store HTTP response headers. + Set to 1 in order to store HTTP response headers. A header value + can be retrieved with $httprhdr(name). </para> <para> <emphasis> @@ -1031,7 +1032,7 @@ switch ($rc) { </section> </section> <section> - <title>Pseudovariables</title> + <title>Pseudo-Variables</title> <section > <title> <function moreinfo="none">$curlerror(error)</function> @@ -1044,6 +1045,15 @@ switch ($rc) { http://curl.haxx.se/libcurl/c/libcurl-errors.html </para> </section> + <section > + <title> + <function moreinfo="none">$httprhdr(name)</function> + </title> + <para> + Return response header value. It requires response_headers parameter + to be set to 1. + </para> + </section> </section> <section> <title>RPC Commands</title>

1 0

git:master:90d78b7b: http_clinet: added variable $httprhdr(name) - get response header value
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 90d78b7b2bfc1899c1b64c2db8a353d43df68218 URL: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:15:41+02:00 http_clinet: added variable $httprhdr(name) - get response header value --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Patch: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index e910b514bbf..0004eb3ddc1 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -39,6 +39,7 @@ #include "../../core/pvar.h" #include "../../core/route_struct.h" #include "../../core/ut.h" +#include "../../core/trim.h" #include "../../core/mem/mem.h" #include "../../core/parser/msg_parser.h" @@ -127,6 +128,46 @@ void http_client_response_headers_reset(void) _http_client_response_headers = NULL; } +/** + * + */ +int http_client_response_headers_get(str *hname, str *hbody) +{ + httpc_hdr_t *it; + char *p; + + if(_http_client_response_headers == NULL) { + return -1; + } + if(hname == NULL || hname->len <= 0 || hbody == NULL) { + return -1; + } + for(it = _http_client_response_headers; it != NULL; it = it->next) { + if(it->name.len == 0 && it->hbuf.s[0] != ' ' && it->hbuf.s[0] != '\t' + && it->hbuf.s[0] != '\r' && it->hbuf.s[0] != '\n') { + /* parsing */ + p = strchr(it->hbuf.s, ':'); + if(p == NULL) { + continue; + } + it->name.s = it->hbuf.s; + it->name.len = p - it->name.s; + trim(&it->name); + p++; + it->body.s = p; + it->body.len = it->hbuf.s + it->hbuf.len - it->body.s; + trim(&it->body); + } + if(it->name.len == hname->len + && strncasecmp(it->name.s, hname->s, hname->len) == 0) { + hbody->s = it->body.s; + hbody->len = it->body.len; + return 0; + } + } + return -1; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. diff --git a/src/modules/http_client/functions.h b/src/modules/http_client/functions.h index d0c66c64e66..30c326bd0f8 100644 --- a/src/modules/http_client/functions.h +++ b/src/modules/http_client/functions.h @@ -78,4 +78,7 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *http_get_content_type(const str *connection); +int http_client_response_headers_get(str *hname, str *hbody); +void http_client_response_headers_reset(void); + #endif /* CURL_FUNCTIONS_H */ diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index d640d772ad3..4bea581d50f 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -164,6 +164,8 @@ static int curl_con_param(modparam_t type, void *val); static int pv_parse_curlerror(pv_spec_p sp, str *in); static int pv_get_curlerror( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_httprhdr(pv_spec_p sp, str *in); +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); /* clang-format off */ /* Exported functions */ @@ -237,6 +239,8 @@ static param_export_t params[] = { static pv_export_t mod_pvs[] = { {{"curlerror", (sizeof("curlerror")-1)}, /* Curl error codes */ PVT_OTHER, pv_get_curlerror, 0, pv_parse_curlerror, 0, 0, 0}, + {{"httprhdr", (sizeof("httprhdr")-1)}, /* HTTP response header */ + PVT_OTHER, pv_get_httprhdr, 0, pv_parse_httprhdr, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1193,6 +1197,35 @@ static int pv_get_curlerror( return pv_get_strval(msg, param, res, &curlerr); } +/** + * + */ +static int pv_parse_httprhdr(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_VAL_STR; + sp->pvp.pvn.u.isname.name.s = *in; + + return 0; +} + +/** + * + */ +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str hbody = STR_NULL; + + if(http_client_response_headers_get(&param->pvn.u.isname.name.s, &hbody) + < 0) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &hbody); +} /* * Fix curl_get_redirect params: connection(string/pvar) url (string that may contain pvars) and

1 0

git:master:f7e0a189: http_client: docs for modparam response_headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: f7e0a189362cc9f5ab8962868496c4b49b72a76c URL: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:33:04+02:00 http_client: docs for modparam response_headers --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Patch: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2fb918d5997..f5eb42f7b91 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -709,6 +709,25 @@ http_follow_redirect = no <programlisting format="linespecific"> ... modparam("http_client", "netinterface", "eth0") +... + </programlisting> + </example> + </section> + <section id="http_client.p.response_headers"> + <title><varname>response_headers</varname> (int)</title> + <para> + Set to 1 in order to store HTTP response headers. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>response_headers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "response_headers", 1) ... </programlisting> </example>

1 0

git:master:8f364976: http_client: option to store http response headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 8f364976a81358de39cb5d675b3703f3f65a0d59 URL: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:20:33+02:00 http_client: option to store http response headers - new modparam response_headers has to be set to 1 --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Patch: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index df6b8233b51..e910b514bbf 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -75,6 +75,58 @@ typedef struct } curl_query_t; +/** + * + */ +typedef struct httpc_hdr +{ + str hbuf; + str name; + str body; + struct httpc_hdr *next; +} httpc_hdr_t; + +/** + * + */ +httpc_hdr_t *_http_client_response_headers = NULL; + +/** + * + */ +httpc_hdr_t *httpc_hdr_block_add(httpc_hdr_t **head, char *s, int len) +{ + httpc_hdr_t *nv; + nv = pkg_mallocxz(sizeof(httpc_hdr_t) + (len + 1) * sizeof(char)); + if(!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->hbuf.s = (char *)nv + sizeof(httpc_hdr_t); + memcpy(nv->hbuf.s, s, len); + nv->hbuf.len = len; + nv->next = *head; + *head = nv; + + return nv; +} + +/** + * + */ +void http_client_response_headers_reset(void) +{ + httpc_hdr_t *it0; + httpc_hdr_t *it1; + it0 = _http_client_response_headers; + while(it0 != NULL) { + it1 = it0->next; + pkg_free(it0); + it0 = it1; + } + _http_client_response_headers = NULL; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. @@ -112,6 +164,20 @@ size_t write_function(void *ptr, size_t size, size_t nmemb, void *stream_ptr) } +size_t http_client_response_header_cb( + char *b, size_t size, size_t nitems, void *userdata) +{ + size_t numbytes; + + numbytes = size * nitems; + LM_DBG("http response header [%.*s]\n", (int)numbytes, b); + + httpc_hdr_block_add(&_http_client_response_headers, b, (int)numbytes); + + return numbytes; + ; +} + /*! Send query to server, optionally post data. */ static int curL_request_url(struct sip_msg *_m, const char *_met, @@ -288,6 +354,12 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, res |= curl_easy_setopt(curl, CURLOPT_INTERFACE, params->netinterface); } + if(http_client_response_headers_param != 0) { + http_client_response_headers_reset(); + res |= curl_easy_setopt( + curl, CURLOPT_HEADERFUNCTION, http_client_response_header_cb); + } + res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)(&stream)); diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 91573425990..d640d772ad3 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -117,6 +117,8 @@ unsigned int default_query_result = 1; /*!< Default download size for result of query function. 0=disabled (no limit) */ unsigned int default_query_maxdatasize = 0; +int http_client_response_headers_param = 0; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -224,6 +226,7 @@ static param_export_t params[] = { {"query_result", PARAM_INT, &default_query_result }, {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {"netinterface", PARAM_STRING, &default_netinterface }, + {"response_headers", PARAM_INT, &http_client_response_headers_param }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index c56f411df1f..42ee1e914f8 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -75,6 +75,8 @@ extern counter_handle_t connfail; /* Failed Connection attempts */ extern char *default_netinterface; +extern int http_client_response_headers_param; /* store http response headers */ + /* Curl stream object */ typedef struct {

1 0

[kamailio/kamailio] Kamailio segfaults when KEMI functions are invoked from app_python script (Issue #3746)
by David Minh Phan 07 Apr '24

07 Apr '24

### Description Kamailio segfaults when KEMI functions are invoked from app_python script ### Troubleshooting The same code was running ok with the 5.6 branch. It seems that the function sr_apy_kemi_exec_func_ex has been re-written in 5.7 with the following main changes : - The long IF/ELSE statement was replace by a FOR loop - The call to PyArg_ParseTuple function was replaced by the call to PyList_GetItem ==> **This seems to be the cause. The value returned by this function is alway NULL** #### Reproduction Any call to KSR.pv.seti function from a PYTHON 2 script would cause this error. #### Log Messages ``` sbin/kamailio[18449]: ERROR: app_python [apy_kemi.c:280]: sr_apy_kemi_exec_func_ex(): null parameter - func: seti idx: 0 argc: 2 Feb 6 11:34:16 .../sbin/kamailio[18509]: CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 37 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:793]: handle_sigs(): child process 18449 exited by a signal 11 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:796]: handle_sigs(): core was not generated Feb 6 11:34:16 .../sbin/kamailio[18380]: INFO: <core> [main.c:818]: handle_sigs(): terminating due to SIGCHLD Feb 6 11:34:16 .../sbin/kamailio[18509]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18502]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18495]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18482]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3746 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3746(a)github.com>

3 3

git:master:b4537720: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: b4537720ff8158d59856cc0601ff4bf84216be99 URL: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-06T08:46:21+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Patch: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf…

1 0

git:master:9b3b8ec9: corex: docs for dns_file parameter
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: 9b3b8ec968c6f7bda0d10a0d4fe593a92560ee7d URL: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:35:19+02:00 corex: docs for dns_file parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Patch: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index d5cfe1db477..3cdad0aa2a5 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -162,6 +162,41 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_file"> + <title><varname>dns_file</varname> (string)</title> + <para> + Path to the file from where to load dns_cache records. It can be set + many times to add more than one file. + </para> + <para> + Inside the file, the dns_cache record has to be in a single line, with + the format of the dns_cache module parameter (see above). Empty lines + or lines with whitespaces only are ignored. Comment lines have to start + with '#'. Comments are not accepted after dns_cache records, only on + separate lines. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_file</varname> parameter</title> + <programlisting format="linespecific"> +... +# content of /etc/kamailio/kamailio-cache.dns + +# IPv4 record +type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0 +# IPv6 record +type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0 +... +... +modparam("corex", "dns_file", "/etc/kamailio/kamailio-cache.dns") +... </programlisting> </example> </section> @@ -1291,4 +1326,3 @@ sub do_uncompress() { </example> </section> </chapter> -

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev