sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
291 discussions

git:master:b7b3f755: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: b7b3f75537e9d816833b3718b7f6290a655c9f45 URL: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-16T15:46:34+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… Patch: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… --- diff --git a/src/modules/ims_qos/README b/src/modules/ims_qos/README index b0981a0c151..71b7dc1b711 100644 --- a/src/modules/ims_qos/README +++ b/src/modules/ims_qos/README @@ -498,13 +498,13 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) 3.24. suspend_transaction integer - If eneabled, suspends the tm transaction while doing the AAR. + If enabled, suspends the tm transaction while doing the AAR. Default value is 1 (enabled) Example 1.24. suspend_transaction parameter usage ... -modparam("ims_qos", "suspend_transaction", 2000) +modparam("ims_qos", "suspend_transaction", 0) ... 4. Functions

1 0

git:master:672b72d6: ims_qos: spelling fix for suspend_transaction docs, more sensible value for example docs
by Henning Westerholt 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 672b72d65aba0b30fb363d60ab648f9705810ba7 URL: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-16T13:36:42Z ims_qos: spelling fix for suspend_transaction docs, more sensible value for example docs --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… Patch: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index b84f9193f91..359f88514ee 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -521,7 +521,7 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <section> <title><varname>suspend_transaction</varname> integer</title> - <para>If eneabled, suspends the tm transaction while doing the AAR.</para> + <para>If enabled, suspends the tm transaction while doing the AAR.</para> <para><emphasis> Default value is 1 (enabled)</emphasis></para> @@ -531,7 +531,7 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <programlisting format="linespecific"> ... -modparam("ims_qos", "suspend_transaction", 2000) +modparam("ims_qos", "suspend_transaction", 0) ... </programlisting> </example>

1 0

git:5.7:02958e56: jwt: use proper internal function for jwt_verify_key()
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: 5.7 Commit: 02958e56fed877275b98a5cf0c568cc4e9175a8c URL: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T10:47:55+02:00 jwt: use proper internal function for jwt_verify_key() (cherry picked from commit 319df7fc417e898e945cac0d44e978c9ff151e3c) --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… Patch: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index adda8d38456..caebefd346a 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -628,7 +628,7 @@ static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaim return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify_key(msg, &skey, &salg, &sclaims, &sjwtval); } /**

1 0

git:master:319df7fc: jwt: use proper internal function for jwt_verify_key()
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 319df7fc417e898e945cac0d44e978c9ff151e3c URL: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T10:46:34+02:00 jwt: use proper internal function for jwt_verify_key() --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… Patch: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6d4b6f7e6ec..0efb793c47f 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -629,7 +629,7 @@ static int w_jwt_verify_key( return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify_key(msg, &skey, &salg, &sclaims, &sjwtval); } /**

1 0

git:master:241127c5: core: added tcp_accept_iplimit parameter
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 241127c5f0820614a3e2ac1467e9f8cb8a0eeb23 URL: https://github.com/kamailio/kamailio/commit/241127c5f0820614a3e2ac1467e9f8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T09:09:08+02:00 core: added tcp_accept_iplimit parameter - set limit for accepted connections from the same ip address - default 1024 --- 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/241127c5f0820614a3e2ac1467e9f8c… Patch: https://github.com/kamailio/kamailio/commit/241127c5f0820614a3e2ac1467e9f8c…

1 0

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: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

← Newer
1
...
21
22
23
24
25
26
27
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023