- sr-dev - kamailio.org

git:master:213e1910: core: added tcp_msg_data_timeout parameter
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 213e19108699ed4ea5c962caf673b0a60ce41480 URL: https://github.com/kamailio/kamailio/commit/213e19108699ed4ea5c962caf673b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T08:57:32+02:00 core: added tcp_msg_data_timeout parameter - duration in seconds for how long to wait till data is received on a new tcp connection - default 20 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/213e19108699ed4ea5c962caf673b0a… Patch: https://github.com/kamailio/kamailio/commit/213e19108699ed4ea5c962caf673b0a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 44c62279b7d..872e4084c17 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -367,6 +367,7 @@ MAXSNDBUFFER maxsndbuffer SQL_BUFFER_SIZE sql_buffer_size MSG_RECV_MAX_SIZE msg_recv_max_size TCP_MSG_READ_TIMEOUT tcp_msg_read_timeout +TCP_MSG_DATA_TIMEOUT tcp_msg_data_timeout TCP_CHECK_TIMER tcp_check_timer CHILDREN children SOCKET socket @@ -855,6 +856,7 @@ IMPORTFILE "import_file" <INITIAL>{SQL_BUFFER_SIZE} { count(); yylval.strval=yytext; return SQL_BUFFER_SIZE; } <INITIAL>{MSG_RECV_MAX_SIZE} { count(); yylval.strval=yytext; return MSG_RECV_MAX_SIZE; } <INITIAL>{TCP_MSG_READ_TIMEOUT} { count(); yylval.strval=yytext; return TCP_MSG_READ_TIMEOUT; } +<INITIAL>{TCP_MSG_DATA_TIMEOUT} { count(); yylval.strval=yytext; return TCP_MSG_DATA_TIMEOUT; } <INITIAL>{TCP_CHECK_TIMER} { count(); yylval.strval=yytext; return TCP_CHECK_TIMER; } <INITIAL>{CHILDREN} { count(); yylval.strval=yytext; return CHILDREN; } <INITIAL>{SOCKET} { count(); yylval.strval=yytext; return SOCKET; } diff --git a/src/core/cfg.y b/src/core/cfg.y index a5e16e259e1..ed6764d09fb 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -423,6 +423,7 @@ extern char *default_routename; %token SQL_BUFFER_SIZE %token MSG_RECV_MAX_SIZE %token TCP_MSG_READ_TIMEOUT +%token TCP_MSG_DATA_TIMEOUT %token TCP_CHECK_TIMER %token USER %token GROUP @@ -1020,6 +1021,8 @@ assign_stm: | MSG_RECV_MAX_SIZE EQUAL error { yyerror("number expected"); } | TCP_MSG_READ_TIMEOUT EQUAL NUMBER { ksr_tcp_msg_read_timeout=$3; } | TCP_MSG_READ_TIMEOUT EQUAL error { yyerror("number expected"); } + | TCP_MSG_DATA_TIMEOUT EQUAL NUMBER { ksr_tcp_msg_data_timeout=$3; } + | TCP_MSG_DATA_TIMEOUT EQUAL error { yyerror("number expected"); } | TCP_CHECK_TIMER EQUAL NUMBER { ksr_tcp_check_timer=$3; } | TCP_CHECK_TIMER EQUAL error { yyerror("number expected"); } | CHILDREN EQUAL NUMBER { children_no=$3; } diff --git a/src/core/globals.h b/src/core/globals.h index aac82563d51..0d7227c9c1e 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -240,6 +240,7 @@ extern int ksr_rpc_exec_delta; extern int ksr_msg_recv_max_size; extern int ksr_tcp_msg_read_timeout; +extern int ksr_tcp_msg_data_timeout; extern int ksr_tcp_check_timer; #ifdef USE_DNS_CACHE diff --git a/src/core/tcp_init.h b/src/core/tcp_init.h index 49c4ef7f748..f1c3ae61b37 100644 --- a/src/core/tcp_init.h +++ b/src/core/tcp_init.h @@ -40,7 +40,6 @@ #define DEFAULT_TCP_WBUF_SIZE 2100 /* after debugging switch to 4-16k */ -#define KSR_TCP_MSGREAD_TIMEOUT 20 /* timeout (secs) to read SIP message */ #define KSR_TCP_ACCEPT_IPLIMIT 1024 /* limit accepted tcp connections from IP */ struct tcp_child diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index bd8b162cd40..60f316d89b4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5518,7 +5518,7 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) if((cidset == 0) && !(con->req.dxstate & KSR_TCP_REQSTATE_DATARECV)) { if(tvnow.tv_sec - con->timestamp - >= ksr_tcp_msg_read_timeout) { + >= ksr_tcp_msg_data_timeout) { LM_DBG("n: %d - connection id: %d (state: %d) - " "message " "receiving timeout: %ld\n", diff --git a/src/main.c b/src/main.c index a949d930407..3b678e14947 100644 --- a/src/main.c +++ b/src/main.c @@ -531,7 +531,8 @@ char *pid_file = 0; /* filename as asked by use */ char *pgid_file = 0; int ksr_msg_recv_max_size = 32767; /* 2^15 - 1 */ -int ksr_tcp_msg_read_timeout = KSR_TCP_MSGREAD_TIMEOUT; +int ksr_tcp_msg_read_timeout = 20; /* timeout (secs) to read SIP message */ +int ksr_tcp_msg_data_timeout = 20; /* timeout (secs) to receive first msg data */ int ksr_tcp_check_timer = 10; /* seconds to check tcp connections */ /* memory manager */

1 0

git:master:92feec4f: core: added tcp_msg_read_timeout parameter
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 92feec4fa026a153d1f9ed79e5893bf1086db909 URL: https://github.com/kamailio/kamailio/commit/92feec4fa026a153d1f9ed79e5893bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T07:20:13+02:00 core: added tcp_msg_read_timeout parameter - specify read timeout for tcp messages --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/92feec4fa026a153d1f9ed79e5893bf… Patch: https://github.com/kamailio/kamailio/commit/92feec4fa026a153d1f9ed79e5893bf…

1 0

git:master:b56037fa: core: added msg_recv_max_size global parameter
by Daniel-Constantin Mierla 14 Oct '23

14 Oct '23

Module: kamailio Branch: master Commit: b56037fab181037d48bfc90802f25b85ae8bee04 URL: https://github.com/kamailio/kamailio/commit/b56037fab181037d48bfc90802f25b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-14T16:49:20+02:00 core: added msg_recv_max_size global parameter - set limit for max size of received tcp or upd messages --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_read.c Modified: src/core/udp_server.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/b56037fab181037d48bfc90802f25b8… Patch: https://github.com/kamailio/kamailio/commit/b56037fab181037d48bfc90802f25b8… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 9e338606c20..e88c54527ba 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -365,6 +365,7 @@ STATS_NAMESEP stats_name_separator MAXBUFFER maxbuffer MAXSNDBUFFER maxsndbuffer SQL_BUFFER_SIZE sql_buffer_size +MSG_RECV_MAX_SIZE msg_recv_max_size CHILDREN children SOCKET socket BIND bind @@ -850,6 +851,7 @@ IMPORTFILE "import_file" <INITIAL>{MAXBUFFER} { count(); yylval.strval=yytext; return MAXBUFFER; } <INITIAL>{MAXSNDBUFFER} { count(); yylval.strval=yytext; return MAXSNDBUFFER; } <INITIAL>{SQL_BUFFER_SIZE} { count(); yylval.strval=yytext; return SQL_BUFFER_SIZE; } +<INITIAL>{MSG_RECV_MAX_SIZE} { count(); yylval.strval=yytext; return MSG_RECV_MAX_SIZE; } <INITIAL>{CHILDREN} { count(); yylval.strval=yytext; return CHILDREN; } <INITIAL>{SOCKET} { count(); yylval.strval=yytext; return SOCKET; } <INITIAL>{BIND} { count(); yylval.strval=yytext; return BIND; } diff --git a/src/core/cfg.y b/src/core/cfg.y index d833288c10d..5a82345a15b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -421,6 +421,7 @@ extern char *default_routename; %token MAXBUFFER %token MAXSNDBUFFER %token SQL_BUFFER_SIZE +%token MSG_RECV_MAX_SIZE %token USER %token GROUP %token CHROOT @@ -1013,6 +1014,8 @@ assign_stm: | MAXSNDBUFFER EQUAL error { yyerror("number expected"); } | SQL_BUFFER_SIZE EQUAL NUMBER { sql_buffer_size=$3; } | SQL_BUFFER_SIZE EQUAL error { yyerror("number expected"); } + | MSG_RECV_MAX_SIZE EQUAL NUMBER { ksr_msg_recv_max_size=$3; } + | MSG_RECV_MAX_SIZE EQUAL error { yyerror("number expected"); } | CHILDREN EQUAL NUMBER { children_no=$3; } | CHILDREN EQUAL error { yyerror("number expected"); } | STATS_NAMESEP EQUAL STRING { ksr_stats_namesep=$3; } diff --git a/src/core/globals.h b/src/core/globals.h index b541d8e9cf8..3a488db23c2 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -238,6 +238,8 @@ extern int ksr_local_rport; extern int ksr_rpc_exec_delta; +extern int ksr_msg_recv_max_size; + #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 31c6e92444c..10fd348696f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1486,7 +1486,6 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, resp = CONN_RELEASE; req = &con->req; if(req->tvrstart.tv_sec == 0) { - LM_DBG("=== set message read start time\n"); gettimeofday(&req->tvrstart, NULL); } @@ -1512,6 +1511,14 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, } #endif + if(ksr_msg_recv_max_size <= (int)(req->parsed - req->start)) { + LOG(cfg_get(core, core_cfg, corelog), + "read message too large: %d - c: %p r: %p (%d)\n", + (int)(req->parsed - req->start), con, req, bytes); + resp = CONN_ERROR; + goto end_req; + } + if(unlikely(bytes < 0)) { LOG(cfg_get(core, core_cfg, corelog), "ERROR: tcp_read_req: error reading - c: %p r: %p (%d)\n", diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 16c85bd8421..7e01dd8c279 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -664,6 +664,11 @@ int udp_rcv_loop() else goto error; } + if(ksr_msg_recv_max_size <= len) { + LOG(cfg_get(core, core_cfg, corelog), + "read message too large: %d\n", len); + continue; + } if(fromaddrlen != (unsigned int)sockaddru_len(bind_address->su)) { LM_ERR("ignoring data - unexpected from addr len: %u != %u\n", fromaddrlen, (unsigned int)sockaddru_len(bind_address->su)); diff --git a/src/main.c b/src/main.c index 90ef4ad49e8..7185f0c0eaf 100644 --- a/src/main.c +++ b/src/main.c @@ -530,6 +530,7 @@ int fixup_complete = 0; /* flag = is the fixup complete ? */ char *pid_file = 0; /* filename as asked by use */ char *pgid_file = 0; +int ksr_msg_recv_max_size = 32767; /* 2^15 - 1 */ /* memory manager */ #define SR_MEMMNG_DEFAULT "qm"

1 0

git:master:a902e4a0: core: tcp - limit number of accepted connections per src ip
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: a902e4a032a85a7755de32eeadac800a1312e64f URL: https://github.com/kamailio/kamailio/commit/a902e4a032a85a7755de32eeadac800… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - limit number of accepted connections per src ip - default 1024 --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/a902e4a032a85a7755de32eeadac800… Patch: https://github.com/kamailio/kamailio/commit/a902e4a032a85a7755de32eeadac800… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 4cb3da51f40..2a4a2dd7b0d 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -47,6 +47,8 @@ #define KSR_TCP_MSGREAD_TIMEOUT 20 /* timeout (secs) to read SIP message */ +#define KSR_TCP_ACCEPT_IPLIMIT 1024 /* limit accepted tcp connections from IP */ + /* tcp connection flags */ #define F_CONN_READ_W 2 /* watched for READ ev. in main */ #define F_CONN_WRITE_W 4 /* watched for WRITE (main) */ @@ -281,6 +283,7 @@ typedef struct tcp_connection unsigned int flags; /* connection related flags */ snd_flags_t send_flags; /* special send flags */ enum tcp_conn_states state; /* connection state */ + enum tcp_conn_states initstate; /* initial connection state */ void *extra_data; /* extra data associated to the connection, 0 for tcp*/ struct timer_ln timer; time_t timestamp; /* connection creation timestamp */ diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 9f39dd72444..aac5347431d 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1162,6 +1162,30 @@ int tcpconn_read_haproxy(struct tcp_connection *c) return (bytes >= 0) ? retval : -1; } +int tcp_connection_limit_srcip(union sockaddr_union *srcaddr, int limit) +{ + struct tcp_connection *con; + ip_addr_t src_ip; + int n; + int i; + + n = 0; + su2ip_addr(&src_ip, srcaddr); + TCPCONN_LOCK; + for(i = 0; i < TCP_ID_HASH_SIZE && n < limit; i++) { + for(con = tcpconn_id_hash[i]; con && n < limit; con = con->id_next) { + if(con->initstate == S_CONN_ACCEPT) { + if(ip_addr_cmp(&src_ip, &con->rcv.src_ip)) { + n++; + } + } + } + } + TCPCONN_UNLOCK; + + return (n >= limit) ? 1 : 0; +} + struct tcp_connection *tcpconn_new(int sock, union sockaddr_union *su, union sockaddr_union *local_addr, struct socket_info *ba, int type, int state) @@ -1217,6 +1241,7 @@ struct tcp_connection *tcpconn_new(int sock, union sockaddr_union *su, c->rcv.proto_reserved1 = 0; /* this will be filled before receive_message*/ c->rcv.proto_reserved2 = 0; c->state = state; + c->initstate = state; c->extra_data = 0; c->timestamp = time(NULL); #ifdef USE_TLS @@ -4426,6 +4451,12 @@ static inline int handle_new_connect(struct socket_info *si) tcp_safe_close(new_sock); return 1; /* success, because the accept was successful */ } + if(unlikely(tcp_connection_limit_srcip(&su, KSR_TCP_ACCEPT_IPLIMIT))) { + LM_CRIT("hit the limit of connections per source IP (%s) - rejecting\n", + su2a(&su, sizeof(su))); + tcp_safe_close(new_sock); + return 1; /* success, because the accept was successful */ + } (*tcp_connections_no)++; if(unlikely(si->proto == PROTO_TLS)) (*tls_connections_no)++; diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 2ad9579854f..31c6e92444c 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -448,7 +448,6 @@ int tcp_read_headers(struct tcp_connection *c, rd_conn_flags_t *read_flags) bytes = tcp_read(c, read_flags); if(bytes <= 0) return bytes; - LM_DBG("===== read %d bytes\n", bytes); gettimeofday(&tvnow, NULL); tvdiff = 1000000 * (tvnow.tv_sec - r->tvrstart.tv_sec) + (tvnow.tv_usec - r->tvrstart.tv_usec); @@ -1661,12 +1660,10 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, req->content_len = 0; req->bytes_to_go = 0; req->pos = req->buf + size; - LM_DBG("=== reset message read start time\n"); req->tvrstart.tv_sec = 0; req->tvrstart.tv_usec = 0; if(unlikely(size)) { - LM_DBG("=== set message read start time\n"); gettimeofday(&req->tvrstart, NULL); memmove(req->buf, req->parsed, size); req->parsed = req->buf; /* fix req->parsed after using it */

1 0

git:master:ef86402d: core: tcp - close connection without data traffic at all
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: ef86402d2397ff7b0416bc17ab0a2ba906402215 URL: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - close connection without data traffic at all - default timeout: 20sec - cleanup is done on timer, it can take another 10sec --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… Patch: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 2e58861277c..4cb3da51f40 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -195,6 +195,8 @@ typedef enum tcp_req_flags #define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) #endif +#define KSR_TCP_REQSTATE_DATARECV (1 << 0) + typedef struct tcp_req { struct tcp_req *next; @@ -214,6 +216,7 @@ typedef struct tcp_req int bytes_to_go; /* how many bytes we have still to read from the body*/ enum tcp_req_errors error; enum tcp_req_states state; + unsigned int dxstate; struct timeval tvrstart; } tcp_req_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f4f00c23420..9f39dd72444 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5454,6 +5454,7 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) struct timeval tvnow; long long tvdiff; long mcmd[2]; + int cidset = 0; if(tcp_disable) { return; @@ -5466,6 +5467,7 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) for(i = 0; i < TCP_ID_HASH_SIZE && n < TCPIDLIST_SIZE; i++) { for(con = tcpconn_id_hash[i]; con && n < TCPIDLIST_SIZE; con = con->id_next) { + cidset = 0; if(con->state == S_CONN_OK) { if(con->req.tvrstart.tv_sec > 0) { tvdiff = 1000000 @@ -5478,18 +5480,34 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) n, con->id, tvdiff); tcpidlist[n] = con->id; n++; + cidset = 1; } } } + if((cidset == 0) + && !(con->req.dxstate & KSR_TCP_REQSTATE_DATARECV)) { + if(tvnow.tv_sec - con->timestamp + >= KSR_TCP_MSGREAD_TIMEOUT) { + LM_DBG("n: %d - connection id: %d (state: %d) - " + "message " + "receiving timeout: %ld\n", + n, con->id, con->state, + (long)(tvnow.tv_sec - con->timestamp)); + tcpidlist[n] = con->id; + n++; + cidset = 1; + } + } } } TCPCONN_UNLOCK; if(n > 0) { for(i = 0; i < n; i++) { if((con = tcpconn_get(tcpidlist[i], 0, 0, 0, 0))) { - LM_CRIT("message reading timeout on connection id: %d - " + LM_CRIT("message processing timeout on connection id: %d " + "(state: %d) - " "closing\n", - tcpidlist[i]); + tcpidlist[i], con->state); mcmd[0] = (long)con; mcmd[1] = CONN_EOF; diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 1592936238b..e6e79c2a174 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1580,6 +1580,7 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, } /* if we are here everything is nice and ok*/ resp = CONN_RELEASE; + req->dxstate |= KSR_TCP_REQSTATE_DATARECV; #ifdef EXTRA_DEBUG LM_DBG("receiving msg(%p, %d)\n", req->start, (int)(req->parsed - req->start));

1 0

git:master:ddfe15f8: core: tcp - exclude crlf ping from data exchage state
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: ddfe15f860555048f1ad6884727d4eb52f11910f URL: https://github.com/kamailio/kamailio/commit/ddfe15f860555048f1ad6884727d4eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - exclude crlf ping from data exchage state --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/ddfe15f860555048f1ad6884727d4eb… Patch: https://github.com/kamailio/kamailio/commit/ddfe15f860555048f1ad6884727d4eb… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index e6e79c2a174..2ad9579854f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1580,7 +1580,9 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, } /* if we are here everything is nice and ok*/ resp = CONN_RELEASE; - req->dxstate |= KSR_TCP_REQSTATE_DATARECV; + if(req->state != H_PING_CRLF) { + req->dxstate |= KSR_TCP_REQSTATE_DATARECV; + } #ifdef EXTRA_DEBUG LM_DBG("receiving msg(%p, %d)\n", req->start, (int)(req->parsed - req->start));

1 0

git:master:f5b46efc: core: tcp - set limit for reading a message
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: f5b46efc3a97aa45d090f46990a40bcc9dd91390 URL: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - set limit for reading a message - default 10sec - if message is not read, close connection - cleanup is done on timer, it can take an additional 10sec to clean up connection --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc… Patch: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc…

1 0

git:master:2df623c7: github: fix cleanup perms [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 2df623c78fd8605b9f7f936efc4cb2011d0a60b5 URL: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T12:42:35+02:00 github: fix cleanup perms [skip ci] --- Modified: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… Patch: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index babf4956fb2..bea47fa30dc 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -13,7 +13,7 @@ jobs: x86_64: runs-on: ubuntu-latest permissions: - packages: admin + packages: write steps: - name: Delete untagged images uses: camargo/delete-untagged-action@v1

1 0

git:master:09729561: github: move cleanup of untagged packages to its own workflow [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 097295616f6387d192c5774ce7fc1a95b1913542 URL: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T12:35:35+02:00 github: move cleanup of untagged packages to its own workflow [skip ci] --- Added: .github/workflows/cleanup.yml Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… Patch: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index eb64a32d73b..3bf126e588d 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -175,10 +175,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - - name: Delete untagged images - if: ${{ steps.should_run.outputs.should_run != 'false' }} - uses: camargo/delete-untagged-action@v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - package-name: ${{ env.IMAGE_NAME }} diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml new file mode 100644 index 00000000000..babf4956fb2 --- /dev/null +++ b/.github/workflows/cleanup.yml @@ -0,0 +1,22 @@ +--- +name: cleanup packages +on: + schedule: + - cron: '0 5 * * *' + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +env: + IMAGE_NAME: kamailio-ci + +jobs: + x86_64: + runs-on: ubuntu-latest + permissions: + packages: admin + steps: + - name: Delete untagged images + uses: camargo/delete-untagged-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + package-name: ${{ env.IMAGE_NAME }}

1 0

git:master:5632d346: github: allow trigger actions manually from panel [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 5632d34677eb9d6feeacda9dba12244f0c5de838 URL: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T10:13:33+02:00 github: allow trigger actions manually from panel [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/cifuzz.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… Patch: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index c11d7056086..eb64a32d73b 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -6,6 +6,8 @@ on: push: tags: - '[0-9]+.[0-9]+.[0-9]+' + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: env: IMAGE_NAME: kamailio-ci diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index a8294516c2a..bb1b712cb5b 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -4,6 +4,8 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: Fuzzing: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 71c8e66cb6c..59e3dbf476f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,6 +5,8 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: analyze: name: Analyze

1 0

git:master:7f4fdfa6: pkg/kamailio/alpine: switch to pcre2 [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 7f4fdfa61444ab38b49b74829a40d9ec6d1e050a URL: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T09:54:53+02:00 pkg/kamailio/alpine: switch to pcre2 [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… Patch: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e585cdb66b6..c69e4dca7fe 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python3-dev - pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev + pcre2-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev @@ -79,7 +79,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ # - modules for devel purposes _mod_list_devel="misctest print print_lib" -# - modules depending on pcre3 library +# - modules depending on pcre2 library _mod_list_pcre="dialplan lcr regex" # - modules depending on radius client library

1 0

git:master:2f212ba4: core: added proto file to use info structure
by Daniel-Constantin Mierla 12 Oct '23

12 Oct '23

Module: kamailio Branch: master Commit: 2f212ba4deab4841382690eed08f9afcae1ec46f URL: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-12T17:46:00+02:00 core: added proto file to use info structure - can be set via socket global parameter structure --- Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af… Patch: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af…

1 0

[kamailio/kamailio] cdp: Not possible to load module with older openssl version than 1.1.1 (Issue #3600)
by mtryfoss 11 Oct '23

11 Oct '23

### Description After adding TLS support to the CDP module, it's no longer possible to load on systems running a version of openssl older than 1.1.1. #### Reproduction Run on system with openssl older than 1.1.1. #### Log Messages  ``` ERROR: <core> [core/sr_module.c:599]: ksr_load_module(): could not open module </usr/local/kamailio-devel/lib64/kamailio/modules/cdp.so>: /usr/local/kamailio-devel/lib64/kamailio/modules/cdp.so: undefined symbol: SSL_CTX_set_max_proto_version ``` ### Possible Solutions I've made a local change based on the approach used in the tls module for different versions of openssl. Do you want me to open a PR for this, or do you want this module clean? Currently I do not have any possibility to test it's actually working, but at least it compiles/loads and makes to module possible to use without encryption. Another solution might be to just include TLS support if the openssl version on the system is 1.1.1 or newer. Else, just do not support it. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` master ``` * **Operating System**:  ``` CentOS 7.9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3600 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3600(a)github.com>

2 4

[kamailio/kamailio] cdp: Disable TLS support for openssl versions older than 1.1.0 (PR #3601)
by mtryfoss 11 Oct '23

11 Oct '23

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3600 #### Description Disabled parts of code if installed openssl version is older than 1.1.0 based on feedback in issue #3600. Tested non-TLS connection locally. Not tested with TLS. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3601 -- Commit Summary -- * cdp: Disable TLS support for openssl versions older than 1.1.0 -- File Changes -- M src/modules/cdp/cdp_mod.c (7) M src/modules/cdp/cdp_tls.c (2) M src/modules/cdp/receiver.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3601.patch https://github.com/kamailio/kamailio/pull/3601.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3601 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3601(a)github.com>

2 4

git:master:4045f3d7: cdp: changed format
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 4045f3d7c0302ae47f0d6c2160160767d56826eb URL: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:19:04+02:00 cdp: changed format --- Modified: src/modules/cdp/cdp_mod.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… Patch: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 5f776f57a1f..963d46c8705 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -239,7 +239,7 @@ static int cdp_init(void) return 1; } - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { init_ssl_methods(); method = tls_parse_method(&tls_method); @@ -248,12 +248,12 @@ static int cdp_init(void) return -1; } } - #else +#else if(enable_tls) { LM_ERR("TLS requires openssl 1.1.0 or newer\n"); return -1; } - #endif +#endif register_procs(2 + config->workers + 2 * config->peers_cnt); cfg_register_child(2 + config->workers + 2 * config->peers_cnt); diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0a15ce3aaeb..ceee98127f6 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -813,12 +813,12 @@ int receive_loop(peer *original_peer) p->R_sock = fd; } - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } - #endif +#endif } else { sp2 = add_serviced_peer(NULL); if(!sp2) { @@ -826,12 +826,12 @@ int receive_loop(peer *original_peer) continue; } sp2->tcp_socket = fd; - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } - #endif +#endif } } } @@ -883,9 +883,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, strerror(errno)); AAAFreeMessage(&msg); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); - #endif +#endif close(sp->tcp_socket); goto drop_peer; } @@ -898,9 +898,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, cnt, msg->buf.len); AAAFreeMessage(&msg); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); - #endif +#endif close(sp->tcp_socket); goto drop_peer; }

1 0

git:master:8d84c621: cdp: Disable TLS support for openssl versions older than 1.1.0
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 8d84c6210fa7071d3ea96f219d486cc1b41dc119 URL: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:19:04+02:00 cdp: Disable TLS support for openssl versions older than 1.1.0 --- Modified: src/modules/cdp/cdp_mod.c Modified: src/modules/cdp/cdp_tls.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… Patch: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index d63e5206d90..5f776f57a1f 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -239,6 +239,7 @@ static int cdp_init(void) return 1; } + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { init_ssl_methods(); method = tls_parse_method(&tls_method); @@ -247,6 +248,12 @@ static int cdp_init(void) return -1; } } + #else + if(enable_tls) { + LM_ERR("TLS requires openssl 1.1.0 or newer\n"); + return -1; + } + #endif register_procs(2 + config->workers + 2 * config->peers_cnt); cfg_register_child(2 + config->workers + 2 * config->peers_cnt); diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 6c7fb9a1f45..903445b676d 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -1,3 +1,4 @@ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L #include "cdp_tls.h" cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, @@ -255,3 +256,4 @@ int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) } return 0; } +#endif \ No newline at end of file diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 3c6223a758a..0a15ce3aaeb 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -813,10 +813,12 @@ int receive_loop(peer *original_peer) p->R_sock = fd; } + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } + #endif } else { sp2 = add_serviced_peer(NULL); if(!sp2) { @@ -824,10 +826,12 @@ int receive_loop(peer *original_peer) continue; } sp2->tcp_socket = fd; + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } + #endif } } } @@ -879,7 +883,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, strerror(errno)); AAAFreeMessage(&msg); + #if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); + #endif close(sp->tcp_socket); goto drop_peer; } @@ -892,7 +898,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, cnt, msg->buf.len); AAAFreeMessage(&msg); + #if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); + #endif close(sp->tcp_socket); goto drop_peer; }

1 0

git:master:54c18ebb: core: mem/shm - wrapper marcro to check if xsetfunc is implemented
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 54c18ebb4b471af95aa403a81d4a37b71c9c4a14 URL: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:11:04+02:00 core: mem/shm - wrapper marcro to check if xsetfunc is implemented --- Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… Patch: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… --- diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 9ea31d53131..8d4d0d95eed 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -105,7 +105,14 @@ extern sr_shm_api_t _shm_root; #define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) #define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) -#define shm_setfunc(p, f) _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)) +#define shm_setfunc(p, f) \ + do { \ + if(_shm_root.xsetfunc) { \ + _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)); \ + } else { \ + LM_ERR("xsetfunc not implemented\n"); \ + } \ + } while(0) void *shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

Kamailio Developers Meeting, Nov 7-8, 2023, in Dusseldorf
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Hello, Kamailio SIP Server project is organizing another meeting of its developers and community members during November 7-8, 2023, hosted again by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and contributors in order to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join, developer or user interested in helping the project. Please note we have a limited capacity of seats in the meeting room, the main policy for accepting participants being first come first server. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: * https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training - Online - Nov 14-16, 2023 -- asipto.com

1 0

[kamailio/kamailio] 503(service unavailable) (Issue #3599)
by masudmuborakshohi 11 Oct '23

11 Oct '23

Hello! It often happens to me that the service begins to refuse service (503) and so far I have not been able to understand the exact reason. Typically, before clients start receiving 503, many before them receive a 408 code. As soon as the service starts responding with 503, it does not recover on its own, you have to restart. There is no way to understand from the logs what led to this (nothing unusual). My server is powerful enough for the number of users of my service (what I mean is that there is no problem with resources). For example, 64 cores, 125GB of DDR4 RAM, 2TB of disk, of which 1TB SSD for the database, 10Gigabit channel, this is only a server for Kamailio for Rtpengines separate servers. Please help me figure out what causes a service failure!? OS: Debian 11, 64 cores, 125GB of DDR4 RAM; DB: MariaDB 10.5.15; kamailio -v version: kamailio 5.5.3 (x86_64/linux) 473cef 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. udp_children: 30; tcp_children: 34; TLS: YES; async_workers: 64. Incoming calls are sent via push notifications( Federico Cabiddu method: [https://www.voztovoice.org/sites/default/files/KamilioWorld2015%20-Federico…). NetBridging(for SIP and RTPEngine). ims_charging for billing (integration with our billing system using the Diameter protocol). In the logs exactly at the moment when the service began to refuse, the recording disappears completely for 7 minutes, absolutely no entries, after which the recording of the TCP queue full begins. Oct 3 18:38:07 sip1-life3 kamailio[3380553]: CRITICAL: {2 3691 INVITE 672699d1-c76b-4153-b72a-fe647913a9e9} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:38:09 sip1-life3 kamailio[3380539]: CRITICAL: {2 3691 INVITE 672699d1-c76b-4153-b72a-fe647913a9e9} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:38:12 sip1-life3 kamailio[3380534]: CRITICAL: {2 30106 INVITE 032f8650-1d90-49ed-82f1-c50ccbef191d} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:45:14 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 285 requests queued (total handled 2899418) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 1, socket 204: queue full, 286 requests queued (total handled 2964063) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 4, socket 210: queue full, 286 requests queued (total handled 2923484) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 6, socket 214: queue full, 286 requests queued (total handled 2911633) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 7, socket 216: queue full, 286 requests queued (total handled 2907132) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 8, socket 218: queue full, 286 requests queued (total handled 2903281) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 9, socket 220: queue full, 286 requests queued (total handled 2903438) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 286 requests queued (total handled 2899419) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 12, socket 226: queue full, 286 requests queued (total handled 2897842) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 16, socket 234: queue full, 286 requests queued (total handled 2895429) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 17, socket 236: queue full, 286 requests queued (total handled 2895303) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 22, socket 246: queue full, 286 requests queued (total handled 2891873) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 26, socket 254: queue full, 286 requests queued (total handled 2892619) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 27, socket 256: queue full, 286 requests queued (total handled 2891769) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 224 , queue entry 0, retries 98, connection 0x7f0b6d974348, tcp so Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 30, socket 262: queue full, 286 requests queued (total handled 2891614) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 31, socket 264: queue full, 286 requests queued (total handled 2890778) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 33, socket 268: queue full, 286 requests queued (total handled 2890852) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 0, socket 202: queue full, 287 requests queued (total handled 3071438) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 1, socket 204: queue full, 287 requests queued (total handled 2964064) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 2, socket 206: queue full, 287 requests queued (total handled 2944928) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 4, socket 210: queue full, 287 requests queued (total handled 2923485) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 5, socket 212: queue full, 287 requests queued (total handled 2915778) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 6, socket 214: queue full, 287 requests queued (total handled 2911634) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 7, socket 216: queue full, 287 requests queued (total handled 2907133) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 8, socket 218: queue full, 287 requests queued (total handled 2903282) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 9, socket 220: queue full, 287 requests queued (total handled 2903439) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 10, socket 222: queue full, 287 requests queued (total handled 2900227) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 287 requests queued (total handled 2899420) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 12, socket 226: queue full, 287 requests queued (total handled 2897843) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 204 , queue entry 0, retries 88, connection 0x7f0b742a1968, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 13, socket 228: queue full, 287 requests queued (total handled 2896210) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 210 , queue entry 0, retries 86, connection 0x7f0b74ffaa08, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 16, socket 234: queue full, 287 requests queued (total handled 2895430) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 214 , queue entry 0, retries 88, connection 0x7f0b75003218, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 216 , queue entry 1, retries 86, connection 0x7f0b75007620, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 218 , queue entry 2, retries 84, connection 0x7f0b74772f70, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 17, socket 236: queue full, 287 requests queued (total handled 2895304) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 220 , queue entry 0, retries 87, connection 0x7f0b74777378, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 224 , queue entry 1, retries 83, connection 0x7f0b7477fb88, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 21, socket 244: queue full, 287 requests queued (total handled 2893042) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3599 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3599(a)github.com>

2 2

git:master:d1d14f9b: pkg/docker: submodule update [skip ci]
by Victor Seva 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: d1d14f9b832401f8282b4e6ade9cfe7ea1751e6a URL: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-11T11:23:38+02:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… Patch: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… --- diff --git a/pkg/docker b/pkg/docker index 524fa4769d3..cf48a82c5f9 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 524fa4769d3b48add204c2bbd8303f60dfde2d61 +Subproject commit cf48a82c5f9df67813d14e6619cc9a41ec9a683b

1 0

[kamailio/kamailio] Typos at https://www.kamailio.org/docs/modules/devel/ (Issue #3596)
by Дилян Палаузов 10 Oct '23

10 Oct '23

At https://www.kamailio.org/docs/modules/devel/ is spelled CALL_CONTROL | Conector to call_control application -- | -- EVREXEC | Execut event routes at startup on dedicated processes It shall be co**NN**ector and execut**E**. Likewise for https://www.kamailio.org/docs/modules/5.8.x/ , https://www.kamailio.org/docs/modules/5.7.x/, https://www.kamailio.org/docs/modules/5.6.x/ … -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3596 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3596(a)github.com>

2 2

[kamailio/kamailio] smsops: avoid c99 error (PR #3597)
by mtryfoss 10 Oct '23

10 Oct '23

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Small adjustment to avoid C99 error from older compiler. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3597 -- Commit Summary -- * smsops: avoid c99 error -- File Changes -- M src/modules/smsops/smsops_impl.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3597.patch https://github.com/kamailio/kamailio/pull/3597.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3597 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3597(a)github.com>

2 1

git:master:65ccf80c: smsops: avoid c99 error (#3597)
by GitHub 10 Oct '23

10 Oct '23

Module: kamailio Branch: master Commit: 65ccf80c90e007d7636e973009d8cb2446cd8821 URL: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Author: mtryfoss <morten(a)tryfoss.no> Committer: GitHub <noreply(a)github.com> Date: 2023-10-10T14:01:38+02:00 smsops: avoid c99 error (#3597) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Patch: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 485a814774c..c8ccc2df4e1 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -511,8 +511,9 @@ int ucs2_to_utf8(char *ucs2, int ucs2_len, char *utf8) uint16_t high_surrogate, low_surrogate; uint32_t codepoint; uint16_t ucs2_char; + size_t ucs2_index; - for(size_t ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { + for(ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { ucs2_char = (unsigned char)ucs2[ucs2_index]; ucs2_char = (ucs2_char << 8) | (unsigned char)ucs2[ucs2_index + 1]; if(ucs2_char <= 0x7F) {

1 0

git:master:8f3d76e9: corex: rpc command to print shm status report to file based on filter
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: 8f3d76e9808024bff1d816acddeb81667e1df0d2 URL: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T13:51:47+02:00 corex: rpc command to print shm status report to file based on filter --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Patch: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 6230f1b129d..02fa08f8a36 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -115,13 +115,41 @@ static void corex_rpc_shm_report(rpc_t *rpc, void *ctx) mrep.min_used_frag_line); } +/*clang-format off*/ +static const char *corex_rpc_shm_rprint_doc[2] = { + "Print shm status report to file matching the filter", 0}; +/*clang-format on*/ + +/* + * RPC command to print the shm status report + */ +static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) +{ + char *fname = NULL; + str fmatch = STR_NULL; + FILE *fp = NULL; + + if(rpc->scan(ctx, "ss", &fname, &fmatch) < 2) { + rpc->fault(ctx, 400, "Filename and filter not provided"); + return; + } + fp = fopen(fname, "w"); + if(fp == NULL) { + LM_ERR("cannot open file: %s\n", fname); + rpc->fault(ctx, 500, "Cannot open file"); + return; + } + shm_status_filter(&fmatch, fp); + fclose(fp); +} + /*clang-format off*/ rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, - {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, - {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, - {0, 0, 0, 0} -}; + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, + {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, + {0, 0, 0, 0}}; /*clang-format on*/ /**

2 4

git:master:a86db7b6: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: a86db7b642feaf4bb7367280463a9b22e33ffae5 URL: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-09T14:16:24+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Patch: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 7d0f6f06082..f50a1287bd8 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -76,6 +76,7 @@ Muhammad Shahzad Shafi 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -180,6 +181,7 @@ Chapter 1. Admin Guide 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -800,6 +802,7 @@ route[reply] { 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 5.1. corex.debug @@ -873,6 +876,18 @@ route[reply] { Example: kamcli rpc shm.stats +5.10. corex.shm.rprint + + Shared memory usage status report printed to file upon filter match + with the file of allocation. + + It takes two parameters: the path to file where to write the report; + the string to match the allocation file (the match is done as value + included in the path fo the allocation file). + + Example: + kamcli rpc shm.rprint /tmp/kamailioshm.txt dns_cache.c + 6. Event Routes 6.1. event_route[network:msg]

1 0

git:master:6e025217: corex: docs for shm.rprint rpc command
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: 6e02521739992a4e7dde0ebfae71186b8e866624 URL: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T14:07:28+02:00 corex: docs for shm.rprint rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… Patch: https://github.com/kamailio/kamailio/commit/6e02521739992a4e7dde0ebfae71186… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6b60cbbf445..29aaa8ccbe8 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1105,6 +1105,26 @@ route[reply] { <programlisting format="linespecific"> &kamcli; rpc shm.stats </programlisting> + </section> + <section id="corex.rpc.shm.rprint"> + <title> + <function moreinfo="none">corex.shm.rprint</function> + </title> + <para> + Shared memory usage status report printed to file upon filter match + with the file of allocation. + </para> + <para> + It takes two parameters: the path to file where to write the report; + the string to match the allocation file (the match is done as value + included in the path fo the allocation file). + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.rprint /tmp/kamailioshm.txt dns_cache.c + </programlisting> </section> </section>

1 0

git:master:2b899606: core: mem - qm_status_filter - change filter from start-with to include
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: 2b899606dd56b841d57eb5bbd94725bd6e5c184d URL: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T13:48:33+02:00 core: mem - qm_status_filter - change filter from start-with to include --- Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… Patch: https://github.com/kamailio/kamailio/commit/2b899606dd56b841d57eb5bbd94725b… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index b6c88b0ec55..5d05af88f9e 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -970,6 +970,26 @@ void qm_status(void *qmp) } +static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) +{ + char *sp = (char *)b1; + char *pp = (char *)b2; + char *eos = sp + l1 - l2; + + if(!(b1 && b2 && l1 && l2)) + return NULL; + + while(sp <= eos) { + if(*sp == *pp) + if(memcmp(sp, pp, l2) == 0) + return sp; + + sp++; + } + + return NULL; +} + void qm_status_filter(void *qmp, str *fmatch, FILE *fp) { struct qm_block *qm; @@ -996,8 +1016,9 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) #ifdef DBG_QM_MALLOC if((fmatch == NULL) || (fmatch->len == 0) || ((strlen(f->file) >= fmatch->len) - && (strncmp(f->file, fmatch->s, fmatch->len) - == 0))) { + && (qm_strnstr(f->file, strlen(f->file), fmatch->s, + fmatch->len) + != NULL))) { fprintf(fp, " %3d. %c address=%p frag=%p size=%lu used=%d\n", i, (f->u.is_free) ? 'A' : 'N', (char *)f + sizeof(struct qm_frag), f, f->size, @@ -1033,11 +1054,17 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) if(!FRAG_WAS_USED(f)) { unused++; #ifdef DBG_QM_MALLOC - fprintf(fp, - "unused fragm.: hash = %3d, fragment %p," - " address %p size %lu, created from %s: %s(%lu)\n", - h, f, (char *)f + sizeof(struct qm_frag), f->size, - f->file, f->func, f->line); + if((fmatch == NULL) || (fmatch->len == 0) + || ((strlen(f->file) >= fmatch->len) + && (qm_strnstr(f->file, strlen(f->file), + fmatch->s, fmatch->len) + != NULL))) { + fprintf(fp, + "unused fragm.: hash = %3d, fragment %p," + " address %p size %lu, created from %s: %s(%lu)\n", + h, f, (char *)f + sizeof(struct qm_frag), f->size, + f->file, f->func, f->line); + } #endif } } diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 6d3a855fa7c..9ea31d53131 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -94,7 +94,7 @@ extern sr_shm_api_t _shm_root; } else { \ LM_ERR("shm status with filter not implemented\n"); \ } \ - while(0) + } while(0) #define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) #define shm_report(mr) _shm_root.xreport(_shm_root.mem_block, mr) #define shm_available() _shm_root.xavailable(_shm_root.mem_block)

1 0

git:5.7:bfbabc34: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty
by S-P Chan 07 Oct '23

07 Oct '23

Module: kamailio Branch: 5.7 Commit: bfbabc3407b984028fd47afdfde5217aef3d6fe5 URL: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:38:01+08:00 pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty Cherry-pick from 18b23187dd --- Modified: pkg/kamailio/scripts/create-src-rpm.sh Modified: pkg/kamailio/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… Patch: https://github.com/kamailio/kamailio/commit/bfbabc3407b984028fd47afdfde5217… --- diff --git a/pkg/kamailio/scripts/create-src-rpm.sh b/pkg/kamailio/scripts/create-src-rpm.sh index ebe792a22bb..febe3b118fb 100755 --- a/pkg/kamailio/scripts/create-src-rpm.sh +++ b/pkg/kamailio/scripts/create-src-rpm.sh @@ -8,8 +8,8 @@ usage() { # creates a src.rpm for mock VER=$1 REL=$2 -[[ -n $VER ]] || { echo "Version not specified"; usage; exit 1; } -[[ -n $REL ]] || { echo "Release not specified"; usage; exit 2; } +[[ -n "$VER" ]] || { echo "Version not specified"; usage; exit 1; } +[[ -n "$REL" ]] || { echo "Release not specified"; usage; exit 2; } git submodule update --init diff --git a/pkg/kamailio/scripts/git-archive-all.sh b/pkg/kamailio/scripts/git-archive-all.sh index 4c85ca83cc4..d0ca6338d71 100755 --- a/pkg/kamailio/scripts/git-archive-all.sh +++ b/pkg/kamailio/scripts/git-archive-all.sh @@ -6,13 +6,13 @@ usage() { echo Usage: pkg/kamailio/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src } -if [ -z $1 ]; then +if [ -z "$1" ]; then echo "You must specify a prefix name." usage exit 1 fi -if [ -z $2 ]; then +if [ -z "$2" ]; then echo "You must specify a super-archive name." usage exit 1

1 0

git:5.7:04ef5978: pkg: add example script to create tarball with submodules instantiated
by S-P Chan 07 Oct '23

07 Oct '23

Module: kamailio Branch: 5.7 Commit: 04ef5978df1937a8b23f245edb5f51a0bf544cae URL: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:37:10+08:00 pkg: add example script to create tarball with submodules instantiated In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. Cherry-pick from aed35ddb6a --- Added: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… Patch: https://github.com/kamailio/kamailio/commit/04ef5978df1937a8b23f245edb5f51a… --- diff --git a/pkg/scripts/git-archive-all.sh b/pkg/scripts/git-archive-all.sh new file mode 100755 index 00000000000..71bacc7d896 --- /dev/null +++ b/pkg/scripts/git-archive-all.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# packaging script to include submodules +# modified from: https://gist.github.com/arteymix/03702e3eb05c2c161a86b49d4626d21f +# Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src + +usage() { + echo Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src +} + +if [ -z $1 ]; then + echo "You must specify a prefix name." + usage + exit 1 +fi + +if [ -z $2 ]; then + echo "You must specify a super-archive name." + usage + exit 1 +fi + +git archive --prefix "$1/" -o "$2.tar" HEAD +git submodule foreach --recursive "git archive --prefix=$1/\$sm_path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/$2.tar \$sha1.tar && rm \$sha1.tar" + +gzip "$2.tar"

1 0

git:5.7:42f20356: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64
by S-P Chan 07 Oct '23

07 Oct '23

Module: kamailio Branch: 5.7 Commit: 42f203569bc3dd2e4a6adb56803f34290f581c08 URL: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-07T09:37:42+08:00 pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64 This mock config can be used to build RPM packages from a kamailio src.rpm. - update pkg/kamailio/obs/README -> README.md to include mock instructions - add script create-src-rpm.sh to create src.rpm for package building Cherry-pick from 9de780b8a7 --- Added: pkg/kamailio/obs/README.md Added: pkg/kamailio/obs/kamailio-8-x86_64.cfg Added: pkg/kamailio/obs/kamailio-9-x86_64.cfg Added: pkg/kamailio/scripts/create-src-rpm.sh Added: pkg/kamailio/scripts/git-archive-all.sh Removed: pkg/kamailio/obs/README Removed: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342… Patch: https://github.com/kamailio/kamailio/commit/42f203569bc3dd2e4a6adb56803f342…

1 0

git:master:18b23187: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 18b23187dd89e3b36c0dd95d4796484bef3d2e62 URL: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T13:48:42+02:00 pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty --- Modified: pkg/kamailio/scripts/create-src-rpm.sh Modified: pkg/kamailio/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Patch: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… --- diff --git a/pkg/kamailio/scripts/create-src-rpm.sh b/pkg/kamailio/scripts/create-src-rpm.sh index ebe792a22bb..febe3b118fb 100755 --- a/pkg/kamailio/scripts/create-src-rpm.sh +++ b/pkg/kamailio/scripts/create-src-rpm.sh @@ -8,8 +8,8 @@ usage() { # creates a src.rpm for mock VER=$1 REL=$2 -[[ -n $VER ]] || { echo "Version not specified"; usage; exit 1; } -[[ -n $REL ]] || { echo "Release not specified"; usage; exit 2; } +[[ -n "$VER" ]] || { echo "Version not specified"; usage; exit 1; } +[[ -n "$REL" ]] || { echo "Release not specified"; usage; exit 2; } git submodule update --init diff --git a/pkg/kamailio/scripts/git-archive-all.sh b/pkg/kamailio/scripts/git-archive-all.sh index 4c85ca83cc4..d0ca6338d71 100755 --- a/pkg/kamailio/scripts/git-archive-all.sh +++ b/pkg/kamailio/scripts/git-archive-all.sh @@ -6,13 +6,13 @@ usage() { echo Usage: pkg/kamailio/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src } -if [ -z $1 ]; then +if [ -z "$1" ]; then echo "You must specify a prefix name." usage exit 1 fi -if [ -z $2 ]; then +if [ -z "$2" ]; then echo "You must specify a super-archive name." usage exit 1

1 0

git:master:f16ec35f: kamdbctl: check if kamctlrc is readable
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: f16ec35fa448d03613e6bbbff4c354012f56073e URL: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T12:33:08+02:00 kamdbctl: check if kamctlrc is readable --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Patch: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4f3f407f040..5a89a9540cd 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -35,13 +35,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc ]; then +if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc fi -if [ -f /usr/local/etc/kamailio/kamctlrc ]; then +if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc fi -if [ -f ~/.kamctlrc ]; then +if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc fi

1 0

git:master:0518410e: pkg/docker: submodule update [skip ci]
by Victor Seva 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 0518410eea14f8949260faec5fb70c97badaa74e URL: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-06T12:25:08+02:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Patch: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… --- diff --git a/pkg/docker b/pkg/docker index 5c45c0f8871..524fa4769d3 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f +Subproject commit 524fa4769d3b48add204c2bbd8303f60dfde2d61

1 0

[kamailio/kamailio] pkg: add example script to create tarball with submodules instantiated (PR #3590)
by space88man 06 Oct '23

06 Oct '23

In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. #### 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 In preparation for packaging tls_wolfssl the distributed source tarballs need to have the submodule instantiated and tar'ed together with the primary source code. This is an example script to package submodule code with the main code. It can be used in CI/CD to prepare the tarball. Subsequently I will update the pkg/ scripts to enable packaging of tls_wolfssl. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3590 -- Commit Summary -- * pkg: add example script to create tarball with submodules instantiated -- File Changes -- A pkg/scripts/git-archive-all.sh (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3590.patch https://github.com/kamailio/kamailio/pull/3590.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3590 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3590(a)github.com>

2 12

git:master:aed35ddb: pkg: add example script to create tarball with submodules instantiated
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: aed35ddb6aac8d12cdd60b07ce5bbc1e57a71b94 URL: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:31:35+02:00 pkg: add example script to create tarball with submodules instantiated In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. --- Added: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… Patch: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… --- diff --git a/pkg/scripts/git-archive-all.sh b/pkg/scripts/git-archive-all.sh new file mode 100755 index 00000000000..71bacc7d896 --- /dev/null +++ b/pkg/scripts/git-archive-all.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# packaging script to include submodules +# modified from: https://gist.github.com/arteymix/03702e3eb05c2c161a86b49d4626d21f +# Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src + +usage() { + echo Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src +} + +if [ -z $1 ]; then + echo "You must specify a prefix name." + usage + exit 1 +fi + +if [ -z $2 ]; then + echo "You must specify a super-archive name." + usage + exit 1 +fi + +git archive --prefix "$1/" -o "$2.tar" HEAD +git submodule foreach --recursive "git archive --prefix=$1/\$sm_path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/$2.tar \$sha1.tar && rm \$sha1.tar" + +gzip "$2.tar"

1 0

git:master:9de780b8: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: 9de780b8a7a1ac4c3a936b86d324c9a5f1527e3d URL: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:31:35+02:00 pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64 This mock config can be used to build RPM packages from a kamailio src.rpm. - update pkg/kamailio/obs/README -> README.md to include mock instructions - add script create-src-rpm.sh to create src.rpm for package building --- Added: pkg/kamailio/obs/README.md Added: pkg/kamailio/obs/kamailio-8-x86_64.cfg Added: pkg/kamailio/obs/kamailio-9-x86_64.cfg Added: pkg/kamailio/scripts/create-src-rpm.sh Added: pkg/kamailio/scripts/git-archive-all.sh Removed: pkg/kamailio/obs/README Removed: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a… Patch: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a…

1 0

git:master:a3fd3b12: kamctl: check if kamctlrc is readable
by Daniel-Constantin Mierla 06 Oct '23

06 Oct '23

Module: kamailio Branch: master Commit: a3fd3b12ca9b1c3688255e9d645085947052bc6d URL: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:19:18+02:00 kamctl: check if kamctlrc is readable - related to GH #3594 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… Patch: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index dd09ffb7daf..ad4262b7fc0 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -39,13 +39,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc ]; then +if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc fi -if [ -f /usr/local/etc/kamailio/kamctlrc ]; then +if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc fi -if [ -f ~/.kamctlrc ]; then +if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc fi

1 0

[kamailio/kamailio] Fix wss forwarding (PR #3588)
by joelbax 06 Oct '23

06 Oct '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3588 -- Commit Summary -- * core: Fixing transport=wss parsin * ut: Adding PROTO_WSS protocol to get_proto -- File Changes -- M src/core/parser/parse_uri.c (39) M src/modules/tm/ut.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3588.patch https://github.com/kamailio/kamailio/pull/3588.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3588 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3588(a)github.com>

2 8

git:5.7:c94a185e: Update wolfSSL to v5.6.3-stable
by S-P Chan 05 Oct '23

05 Oct '23

Module: kamailio Branch: 5.7 Commit: c94a185e36709241438cb07f38b7c26f72f40e05 URL: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-06T07:22:28+08:00 Update wolfSSL to v5.6.3-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… Patch: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index a7635da9e64..3b3c175af0e 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit a7635da9e64a43028d2f8f14bce75e4bed39f162 +Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f

1 0

git:master:e01d1cbf: github: define DOCKER_REPO at alpine workflow [skip ci]
by Victor Seva 05 Oct '23

05 Oct '23

Module: kamailio Branch: master Commit: e01d1cbfb61e0111a4f73e58e36a2bd689a2f91f URL: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-06T00:44:41+02:00 github: define DOCKER_REPO at alpine workflow [skip ci] > https://github.com/kamailio/kamailio-ci/commit/524fa4769d3b48add204c2bbd830… --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… Patch: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 511fad53447..c11d7056086 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,6 +10,7 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} + DOCKER_REPO: ghcr.io/kamailio/kamailio-ci jobs: x86_64:

1 0

git:master:022f0f4c: misc/examples/kemi: add the option for using rtpengine in common cfg file
by Daniel-Constantin Mierla 05 Oct '23

05 Oct '23

Module: kamailio Branch: master Commit: 022f0f4cfd49e7a46efb2b6b4e1b9640c399e535 URL: https://github.com/kamailio/kamailio/commit/022f0f4cfd49e7a46efb2b6b4e1b964… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-05T18:05:00+02:00 misc/examples/kemi: add the option for using rtpengine in common cfg file - updated lua script removing the check of rtpproxy define, not being in the commng cfg file --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/022f0f4cfd49e7a46efb2b6b4e1b964… Patch: https://github.com/kamailio/kamailio/commit/022f0f4cfd49e7a46efb2b6b4e1b964… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index fe9b131f570..dc26c653d9a 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -360,7 +360,7 @@ function ksr_route_natmanage() else KSR.rtpengine.rtpengine_manage("replace-origin replace-session-connection"); end - elseif KSR.kx.ifdef('WITH_RTPPROXY') then + else if KSR.nathelper.nat_uac_test(8)>0 then KSR.rtpproxy.rtpproxy_manage("co"); else diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index c4169383ef0..d1fb05d350e 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -39,6 +39,12 @@ # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # +# *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: +# - define WITH_RTPENGINE +# - install RTPEngine: https://github.com/sipwise/rtpengine +# - start RTPEngine: +# rtpengine --listen-ng=127.0.0.1:2223 ... +# # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS @@ -237,8 +243,12 @@ loadmodule "permissions.so" #!ifdef WITH_NAT loadmodule "nathelper.so" +#!ifdef WITH_RTPENGINE +loadmodule "rtpengine.so" +#!else loadmodule "rtpproxy.so" #!endif +#!endif #!ifdef WITH_TLS loadmodule "tls.so" @@ -352,8 +362,13 @@ modparam("permissions", "db_mode", 1) #!ifdef WITH_NAT +#!ifdef WITH_RTPENGINE +# ----- rtpengine params ----- +modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +#!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") +#!endif # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30)

1 0

[kamailio/kamailio] dispatcher: fix weighted sort for n<100 calls (PR #3531)
by Tyler Moore 05 Oct '23

05 Oct '23

- update weighted/relative weighted algos to use probability based sort - calls from 0-99 now follow the weighted distributions - removed the now unused shuffle_uint100array() function #### 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: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The previous random sort for weights in a dispatcher set distributed correctly only after a minimum of n=100 calls. This PR fixes the sort algorithm to distribute calls based on those weights, even for n<100 calls. The real benefit here is customers can see the weighted distribution occur sooner now, when testing. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3531 -- Commit Summary -- * dispatcher: fix weighted sort for n<100 calls -- File Changes -- M src/modules/dispatcher/dispatch.c (313) M src/modules/dispatcher/doc/dispatcher.xml (9) M src/modules/dispatcher/doc/dispatcher_admin.xml (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3531.patch https://github.com/kamailio/kamailio/pull/3531.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3531 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3531(a)github.com>

3 15

very frequent 503 error code and complete service failure
by masoud96＠mail.ru 05 Oct '23

05 Oct '23

Hello! It often happens to me that the service begins to refuse service (503) and so far I have not been able to understand the exact reason. Typically, before clients start receiving 503, many before them receive a 408 code. As soon as the service starts responding with 503, it does not recover on its own, you have to restart. There is no way to understand from the logs what led to this (nothing unusual). My server is powerful enough for the number of users of my service (what I mean is that there is no problem with resources). For example, 64 cores, 125GB of DDR4 RAM, 2TB of disk, of which 1TB SSD for the database, 10Gigabit channel, this is only a server for Kamailio for Rtpengines separate servers. Please help me figure out what causes a service failure!? OS: Debian 11, 64 cores, 125GB of DDR4 RAM; DB: MariaDB 10.5.15; kamailio -v version: kamailio 5.5.3 (x86_64/linux) 473cef 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. udp_children: 30; tcp_children: 34; TLS: YES; async_workers: 64. Incoming calls are sent via push notifications( Federico Cabiddu method: https://www.voztovoice.org/sites/default/files/KamilioWorld2015%20-Federico…). NetBridging(for SIP and RTPEngine). ims_charging for billing (integration with our billing system using the Diameter protocol).

1 1

[kamailio/kamailio] pkg: RPM packaging add kamailio-tls_wolfssl subpackage (PR #3591)
by space88man 05 Oct '23

05 Oct '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3591 -- Commit Summary -- * pkg: RPM packaging add kamailio-tls_wolfssl subpackage -- File Changes -- M pkg/kamailio/obs/kamailio.spec (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3591.patch https://github.com/kamailio/kamailio/pull/3591.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3591 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3591(a)github.com>

1 1

git:master:f04f8539: examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine
by Daniel-Constantin Mierla 05 Oct '23

05 Oct '23

Module: kamailio Branch: master Commit: f04f8539fccfc2afefb5e0badb4747adead2e378 URL: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-05T07:56:24+02:00 examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… Patch: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index d3de2688243..fe9b131f570 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -340,7 +340,7 @@ end -- RTPProxy control function ksr_route_natmanage() - if not KSR.rtpproxy then + if not KSR.rtpproxy and not KSR.rtpengine then return 1; end if KSR.siputils.is_request()>0 then @@ -354,7 +354,19 @@ function ksr_route_natmanage() return 1; end - KSR.rtpproxy.rtpproxy_manage("co"); + if KSR.kx.ifdef('WITH_RTPENGINE') then + if KSR.nathelper.nat_uac_test(8)>0 then + KSR.rtpengine.rtpengine_manage("replace-origin replace-session-connection SIP-source-address"); + else + KSR.rtpengine.rtpengine_manage("replace-origin replace-session-connection"); + end + elseif KSR.kx.ifdef('WITH_RTPPROXY') then + if KSR.nathelper.nat_uac_test(8)>0 then + KSR.rtpproxy.rtpproxy_manage("co"); + else + KSR.rtpproxy.rtpproxy_manage("cor"); + end + end if KSR.siputils.is_request()>0 then if KSR.siputils.has_totag()<0 then

1 0

[kamailio/kamailio] examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine (PR #3587)
by Дилян Палаузов 05 Oct '23

05 Oct '23

A while ago I wanted to adjust my Lua configuration to work with rtpengine and I have adjusted this example accordingly. I have not tried the example, but if there are no obvious bugs with it, I think it will be useful. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3587 -- Commit Summary -- * examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine -- File Changes -- M misc/examples/kemi/kamailio-basic-kemi-lua.lua (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3587.patch https://github.com/kamailio/kamailio/pull/3587.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3587 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3587(a)github.com>

2 2

git:master:ec14d709: tls_wolfssl: update to v5.6.3-stable of wolfSSL
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: ec14d7094374f6cb6184c997ec35951ba0134933 URL: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:22:24+08:00 tls_wolfssl: update to v5.6.3-stable of wolfSSL --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… Patch: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index a7635da9e64..3b3c175af0e 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit a7635da9e64a43028d2f8f14bce75e4bed39f162 +Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f

1 0

git:5.7:ee9ed433: tls_wolfssl: clean up build
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: 5.7 Commit: ee9ed43318c8e49432445d33b475c67a3643d761 URL: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:15:45+08:00 tls_wolfssl: clean up build Allow module to build if user specifies prefix= exec-prefix= on commandline Cherry-pick from a327cc0e3e --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… Patch: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..730076023a9 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,14 +23,14 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ --disable-aligndata --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) install + @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:a327cc0e: tls_wolfssl: clean up build
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: a327cc0e3e0a2d99680840667ba2985857fbe7fa URL: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:09:25+08:00 tls_wolfssl: clean up build Allow module to build if user specifies prefix= exec-prefix= on commandline --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… Patch: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..730076023a9 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,14 +23,14 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ --disable-aligndata --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) install + @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:ac0ecee2: github: move permissions definitions to jobs [skip ci]
by Victor Seva 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: ac0ecee2932f4dc1243847ece4d03d27601778a8 URL: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-04T15:43:31+02:00 github: move permissions definitions to jobs [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/cifuzz.yml Modified: .github/workflows/codeql.yml Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… Patch: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 33f4dc08884..511fad53447 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,13 +10,13 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} -permissions: - contents: read - packages: write + jobs: x86_64: runs-on: ubuntu-latest - + permissions: + contents: read + packages: write steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index d376f8a1b3c..a8294516c2a 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -4,11 +4,11 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" -permissions: - contents: read jobs: Fuzzing: runs-on: ubuntu-latest + permissions: + contents: read steps: - name: Build Fuzzers id: build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b6837bbdd0b..71c8e66cb6c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,8 +5,6 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" -permissions: - contents: read jobs: analyze: name: Analyze diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04885eaf034..8f1d028cda8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,11 +6,11 @@ name: build - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -permissions: - contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} volumes: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bfba0702bdf..a2fc539ddfc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,11 +6,11 @@ name: checks_pr - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -permissions: - contents: read # to fetch code (actions/checkout) jobs: check-format: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) steps: - uses: actions/checkout@v4 - uses: wolletd/clang-format-checker(a)v1.10 @@ -18,6 +18,8 @@ jobs: target-ref: master build: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} volumes:

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev