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
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index 367f7fa..d5f12de 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -1865,7 +1865,7 @@
{
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 @@
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;