aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-11-03 14:46:56 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-11-03 14:46:56 +0100
commit0425c38febda4173d9237da4a74bee9fa0b7426c (patch)
treee071186a5c9e86749f0c26de10d9702f21cb94f1 /openbsc
parent7bf66c5a6ee085bb84e5f1de12725d7006cf6a3c (diff)
bsc: Fix crash when making a MSC connection.
Use the right types that are passed as void..
Diffstat (limited to 'openbsc')
-rw-r--r--openbsc/src/bsc/osmo_bsc_msc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/openbsc/src/bsc/osmo_bsc_msc.c b/openbsc/src/bsc/osmo_bsc_msc.c
index 0bdb71fee..e2aedaaf2 100644
--- a/openbsc/src/bsc/osmo_bsc_msc.c
+++ b/openbsc/src/bsc/osmo_bsc_msc.c
@@ -194,8 +194,7 @@ static int ipaccess_a_fd_cb(struct bsc_fd *bfd)
int error;
struct msgb *msg = ipaccess_read_msg(bfd, &error);
struct ipaccess_head *hh;
- struct gsm_network *net = (struct gsm_network *) bfd->data;
- struct osmo_msc_data *data = net->msc_data;
+ struct osmo_msc_data *data = (struct osmo_msc_data *) bfd->data;
if (!msg) {
if (error == 0) {
@@ -283,7 +282,7 @@ static void msc_connection_connected(struct bsc_msc_connection *con)
LOGP(DMSC, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno));
data = (struct osmo_msc_data *) con->write_queue.bfd.data;
- msc_ping_timeout_cb(con);
+ msc_ping_timeout_cb(data);
sig.data = data;
dispatch_signal(SS_MSC, S_MSC_CONNECTED, &sig);