move to libcommon-cs: gsm48_create_mm_serv_rej(), gsm48_create_loc_upd_rej()
Used by libbsc, libmsc as well as osmo-bsc and osmo-bsc_nat. Moving gsm48_create* to libcommon-cs affects linking of osmo-bsc_nat, resulting in undefined references to gsm48_extract_mi() and gsm48_paging_extract_mi(); fix that by placing libfilter.a left of libbsc.a upon linker invocation. Change-Id: I212c2567b56191022b683674c1c4daf842839946
This commit is contained in:
parent
e78ae21ff4
commit
28f637ec2c
|
@ -634,39 +634,6 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value)
|
|
||||||
{
|
|
||||||
struct msgb *msg;
|
|
||||||
struct gsm48_hdr *gh;
|
|
||||||
|
|
||||||
msg = gsm48_msgb_alloc_name("GSM 04.08 SERV REJ");
|
|
||||||
if (!msg)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);
|
|
||||||
gh->proto_discr = GSM48_PDISC_MM;
|
|
||||||
gh->msg_type = GSM48_MT_MM_CM_SERV_REJ;
|
|
||||||
gh->data[0] = value;
|
|
||||||
|
|
||||||
return msg;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct msgb *gsm48_create_loc_upd_rej(uint8_t cause)
|
|
||||||
{
|
|
||||||
struct gsm48_hdr *gh;
|
|
||||||
struct msgb *msg;
|
|
||||||
|
|
||||||
msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD REJ");
|
|
||||||
if (!msg)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);
|
|
||||||
gh->proto_discr = GSM48_PDISC_MM;
|
|
||||||
gh->msg_type = GSM48_MT_MM_LOC_UPD_REJECT;
|
|
||||||
gh->data[0] = cause;
|
|
||||||
return msg;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 9.2.5 CM service accept */
|
/* 9.2.5 CM service accept */
|
||||||
int gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn)
|
int gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn)
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,3 +80,36 @@ struct gsm_network *gsm_network_init(void *ctx,
|
||||||
|
|
||||||
return net;
|
return net;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value)
|
||||||
|
{
|
||||||
|
struct msgb *msg;
|
||||||
|
struct gsm48_hdr *gh;
|
||||||
|
|
||||||
|
msg = gsm48_msgb_alloc_name("GSM 04.08 SERV REJ");
|
||||||
|
if (!msg)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);
|
||||||
|
gh->proto_discr = GSM48_PDISC_MM;
|
||||||
|
gh->msg_type = GSM48_MT_MM_CM_SERV_REJ;
|
||||||
|
gh->data[0] = value;
|
||||||
|
|
||||||
|
return msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct msgb *gsm48_create_loc_upd_rej(uint8_t cause)
|
||||||
|
{
|
||||||
|
struct gsm48_hdr *gh;
|
||||||
|
struct msgb *msg;
|
||||||
|
|
||||||
|
msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD REJ");
|
||||||
|
if (!msg)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);
|
||||||
|
gh->proto_discr = GSM48_PDISC_MM;
|
||||||
|
gh->msg_type = GSM48_MT_MM_LOC_UPD_REJECT;
|
||||||
|
gh->data[0] = cause;
|
||||||
|
return msg;
|
||||||
|
}
|
||||||
|
|
|
@ -41,11 +41,11 @@ osmo_bsc_nat_SOURCES = \
|
||||||
|
|
||||||
osmo_bsc_nat_LDADD = \
|
osmo_bsc_nat_LDADD = \
|
||||||
$(top_builddir)/src/libmgcp/libmgcp.a \
|
$(top_builddir)/src/libmgcp/libmgcp.a \
|
||||||
|
$(top_builddir)/src/libfilter/libfilter.a \
|
||||||
$(top_builddir)/src/libbsc/libbsc.a \
|
$(top_builddir)/src/libbsc/libbsc.a \
|
||||||
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
|
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
|
||||||
$(top_builddir)/src/libtrau/libtrau.a \
|
$(top_builddir)/src/libtrau/libtrau.a \
|
||||||
$(top_builddir)/src/libcommon/libcommon.a \
|
$(top_builddir)/src/libcommon/libcommon.a \
|
||||||
$(top_builddir)/src/libfilter/libfilter.a \
|
|
||||||
$(LIBOSMOSCCP_LIBS) \
|
$(LIBOSMOSCCP_LIBS) \
|
||||||
$(LIBOSMOCORE_LIBS) \
|
$(LIBOSMOCORE_LIBS) \
|
||||||
$(LIBOSMOGSM_LIBS) \
|
$(LIBOSMOGSM_LIBS) \
|
||||||
|
|
Loading…
Reference in New Issue