[S] Change in osmo-sgsn[master]: iu_client: rename symbols to prevent clashes with libosmo-ranap

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40849?usp=email ) Change subject: iu_client: rename symbols to prevent clashes with libosmo-ranap ...................................................................... iu_client: rename symbols to prevent clashes with libosmo-ranap While moving the iu_client into osmoSGSN, it's not allowed to have the same global symbols in the library as in osmoSGSN. Change-Id: I2af29b38f110b80f69ef598c8e2700ff323a9d7c --- M include/osmocom/sgsn/iu_client.h M src/sgsn/iu_client.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/49/40849/1 diff --git a/include/osmocom/sgsn/iu_client.h b/include/osmocom/sgsn/iu_client.h index 7b5c1b4..8277886 100644 --- a/include/osmocom/sgsn/iu_client.h +++ b/include/osmocom/sgsn/iu_client.h @@ -54,10 +54,10 @@ RANAP_IU_EVENT_NEW_AREA, /* Either a new LAC/RAC has been detected */ }; -extern const struct value_string ranap_iu_event_type_names[]; -static inline const char *ranap_iu_event_type_str(enum ranap_iu_event_type e) +extern const struct value_string iu_client_event_type_names[]; +static inline const char *iu_client_event_type_str(enum ranap_iu_event_type e) { - return get_value_string(ranap_iu_event_type_names, e); + return get_value_string(iu_client_event_type_names, e); } /* Implementations of iu_recv_cb_t shall find the ranap_ue_conn_ctx in msg->dst. */ diff --git a/src/sgsn/iu_client.c b/src/sgsn/iu_client.c index 8d20602..0536e8c 100644 --- a/src/sgsn/iu_client.c +++ b/src/sgsn/iu_client.c @@ -102,7 +102,7 @@ /* This rac will be used internally. RAC with 0xff will be rejected */ #define OSMO_RESERVED_RAC 0xff -const struct value_string ranap_iu_event_type_names[] = { +const struct value_string iu_client_event_type_names[] = { OSMO_VALUE_STRING(RANAP_IU_EVENT_RAB_ASSIGN), OSMO_VALUE_STRING(RANAP_IU_EVENT_SECURITY_MODE_COMPLETE), OSMO_VALUE_STRING(RANAP_IU_EVENT_IU_RELEASE), @@ -121,7 +121,7 @@ if (ue_ctx && !ue_ctx->notification) return 0; - LOGPIU(LOGL_DEBUG, "Submit Iu event to upper layer: %s\n", ranap_iu_event_type_str(type)); + LOGPIU(LOGL_DEBUG, "Submit Iu event to upper layer: %s\n", iu_client_event_type_str(type)); return global_iu_event_cb(ue_ctx, type, data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40849?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2af29b38f110b80f69ef598c8e2700ff323a9d7c Gerrit-Change-Number: 40849 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>