sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
256 discussions

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

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024