paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-02 13:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

msc: Stop the connection timeout when we unregister the bfd

Browse Source 
When we dropped the connection... stop the timer as we might
call bsc_unregister_fd twice...
This commit is contained in:
Holger Hans Peter Freyther
2010-10-07 04:42:03 +08:00
parent 088601004c
commit 588c423f12
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openbsc/src/bsc_msc.c
View File

@@ -76,6 +76,9 @@ static int msc_connection_connect(struct bsc_fd *fd, unsigned int what)
queue = container_of(fd, struct write_queue, bfd);
con = container_of(queue, struct bsc_msc_connection, write_queue);
/* From here on we will either be connected or reconnect */
bsc_del_timer(&con->timeout_timer);
/* check the socket state */
rc = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &val, &len);
if (rc != 0) {
@@ -93,7 +96,6 @@ static int msc_connection_connect(struct bsc_fd *fd, unsigned int what)
fd->when = BSC_FD_READ | BSC_FD_EXCEPT;
con->is_connected = 1;
bsc_del_timer(&con->timeout_timer);
LOGP(DMSC, LOGL_NOTICE, "(Re)Connected to the MSC.\n");
if (con->connected)
con->connected(con);
@@ -214,6 +216,7 @@ struct bsc_msc_connection *bsc_msc_create(const char *ip, int port, int prio)
void bsc_msc_lost(struct bsc_msc_connection *con)
{
write_queue_clear(&con->write_queue);
bsc_del_timer(&con->timeout_timer);
bsc_unregister_fd(&con->write_queue.bfd);
connection_loss(con);
}