From 92f70c577393feba97d6dcf8c1ce5e37571f85d9 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 12 Jun 2009 01:54:08 +0800 Subject: [PATCH] 04.08: Make mncc-harald branch work This fixes two reasons for crashes due to uninitialized memory or wrong pointer passing introduced in my own mncc modifications --- openbsc/src/gsm_04_08.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c index 367f7fa70..d5f12de7f 100644 --- a/openbsc/src/gsm_04_08.c +++ b/openbsc/src/gsm_04_08.c @@ -1865,7 +1865,7 @@ int mncc_release_ind(struct gsm_network *net, struct gsm_trans *trans, { struct gsm_mncc rel; - memset(&rel, 0, sizeof(&rel)); + memset(&rel, 0, sizeof(rel)); rel.callref = callref; mncc_set_cause(&rel, GSM48_CAUSE_LOC_PRN_S_LU, GSM48_CC_CAUSE_UNASSIGNED_NR); @@ -3457,7 +3457,7 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg) bts->nr, data->called.number, get_mncc_name(msg_type)); /* Trigger paging */ - paging_request(bts, subscr, RSL_CHANNEED_TCH_F, + paging_request(net, subscr, RSL_CHANNEED_TCH_F, setup_trig_pag_evt, subscr); } while (1); return 0;