Skip to content

GCVCALLP-3104: Fix duplicated connection IDs #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benceszigeti merged 1 commit into from
Aug 31, 2026
Merged

GCVCALLP-3104: Fix duplicated connection IDs #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion net/net_tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ struct tcp_worker *tcp_workers=0;
* quickly finding the corresponding connection for a reply */
static unsigned int* connection_id=0;

static gen_lock_t* connection_id_lock=0;

/* array of TCP partitions */
static struct tcp_partition tcp_parts[TCP_PARTITION_SIZE];

Expand Down Expand Up @@ -898,6 +900,18 @@ static inline void tcpconn_ref(struct tcp_connection* c)
}


static inline unsigned int tcpconn_next_id(void)
{
unsigned int id;

lock_get(connection_id_lock);
id = (*connection_id)++;
lock_release(connection_id_lock);

return id;
}


static struct tcp_connection* tcpconn_new(int sock, const union sockaddr_union* su,
const struct socket_info* si, const struct tcp_conn_profile *prof,
int state, int flags, int in_main_proc)
Expand Down Expand Up @@ -935,7 +949,7 @@ static struct tcp_connection* tcpconn_new(int sock, const union sockaddr_union*
c->rcv.dst_port = su_getport(&local_su);
print_ip("tcpconn_new: new tcp connection to: ", &c->rcv.src_ip, "\n");
LM_DBG("on port %d, proto %d\n", c->rcv.src_port, si->proto);
c->id=(*connection_id)++;
c->id=tcpconn_next_id();
c->cid = (unsigned long long)c->id
| ( (unsigned long long)(startup_time&0xFFFFFF) << 32 )
| ( (unsigned long long)(rand()&0xFF) << 56 );
Expand Down Expand Up @@ -1835,6 +1849,17 @@ int tcp_init(void)
// The rand() function returns a pseudo-random integer in the range 0 to
// RAND_MAX inclusive (i.e., the mathematical range [0, RAND_MAX]).
*connection_id=(unsigned int)rand();
connection_id_lock=lock_alloc();
if (connection_id_lock==0){
LM_CRIT("could not alloc connection ID lock\n");
goto error;
}
if (lock_init(connection_id_lock)==0){
LM_CRIT("could not init connection ID lock\n");
lock_dealloc((void*)connection_id_lock);
connection_id_lock=0;
goto error;
}
memset( &tcp_parts, 0, TCP_PARTITION_SIZE*sizeof(struct tcp_partition));
/* init partitions */
for( i=0 ; i<TCP_PARTITION_SIZE ; i++ ) {
Expand Down Expand Up @@ -1892,6 +1917,12 @@ void tcp_destroy(void)
connection_id=0;
}

if (connection_id_lock){
lock_destroy(connection_id_lock);
lock_dealloc((void*)connection_id_lock);
connection_id_lock=0;
}

for ( part=0 ; part<TCP_PARTITION_SIZE ; part++ ) {
if (tcp_parts[part].tcpconn_id_hash){
shm_free(tcp_parts[part].tcpconn_id_hash);
Expand Down
Loading