summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-24 04:02:55 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-24 04:02:55 +0100
commit058956e8ee8d1eb0d01cbf7aab343bf5a66e2b6c (patch)
tree6ebf51058396bebf6209b8d43a366406421649b1
parenta34bb9167ff548cc71b48f4dfd82a7a1169db43a (diff)
ipaccess: Handle the case of replacing RSL connections
Fix a infinite loop when establishing a new RSL connection and the BSC is identifying itself with a unit id of an already established RSL connection. The infinite loops happens because we are corrupting the the linuxlist inside the bsc_fd when registering the bfd twice. Due the lack of proper authentication favor the new RSL connection as the real one and close the previous one.
-rw-r--r--openbsc/src/input/ipaccess.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/openbsc/src/input/ipaccess.c b/openbsc/src/input/ipaccess.c
index a645da85d..aa598dfb8 100644
--- a/openbsc/src/input/ipaccess.c
+++ b/openbsc/src/input/ipaccess.c
@@ -242,6 +242,13 @@ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg,
trx->rsl_link = e1inp_sign_link_create(e1i_ts,
E1INP_SIGN_RSL, trx,
trx->rsl_tei, 0);
+
+ if (newbfd->fd >= 0) {
+ LOGP(DINP, LOGL_ERROR, "BTS is still registered. Closing old connection.\n");
+ bsc_unregister_fd(newbfd);
+ close(newbfd->fd);
+ }
+
/* get rid of our old temporary bfd */
memcpy(newbfd, bfd, sizeof(*newbfd));
newbfd->priv_nr = 2+trx_id;