From 9b427b7341cef83374ca17e8cee6174b86fac3cb Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 18 Feb 2024 17:51:16 +0100 Subject: [PATCH] osmo_epdg: utils: add prefix epdg_ to all functions Otherwise get_imsi() will clash in osmo_epdg_ue(). --- src/libcharon/plugins/osmo_epdg/gsup_client.c | 2 +- src/libcharon/plugins/osmo_epdg/ipa_client.c | 4 ++-- src/libcharon/plugins/osmo_epdg/osmo_epdg_db.c | 4 ++-- .../plugins/osmo_epdg/osmo_epdg_listener.c | 6 +++--- .../plugins/osmo_epdg/osmo_epdg_provider.c | 4 ++-- src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.c | 14 +++++++------- src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.h | 12 ++++++------ 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/libcharon/plugins/osmo_epdg/gsup_client.c b/src/libcharon/plugins/osmo_epdg/gsup_client.c index e41136ca4..a93cd1753 100644 --- a/src/libcharon/plugins/osmo_epdg/gsup_client.c +++ b/src/libcharon/plugins/osmo_epdg/gsup_client.c @@ -141,7 +141,7 @@ static struct msgb *encode_to_msgb(struct osmo_gsup_message *gsup_msg) return NULL; } - msg = chunk_to_msgb(&msg_chunk); + msg = epdg_chunk_to_msgb(&msg_chunk); if (!msg) { goto free_msg; diff --git a/src/libcharon/plugins/osmo_epdg/ipa_client.c b/src/libcharon/plugins/osmo_epdg/ipa_client.c index 71a539492..bc77f7e51 100644 --- a/src/libcharon/plugins/osmo_epdg/ipa_client.c +++ b/src/libcharon/plugins/osmo_epdg/ipa_client.c @@ -200,7 +200,7 @@ static void ipa_pdu_base_send_id_resp(private_osmo_epdg_ipa_client_t *this, stru return; } - resp = chunk_to_msgb(&resp_pdu); + resp = epdg_chunk_to_msgb(&resp_pdu); /* remove the ipaccess header so we can use msg_pull on the message */ msgb_pull(req, sizeof(struct ipaccess_head)); @@ -325,7 +325,7 @@ CALLBACK(on_stream_read, bool, /* TODO: -ENOMEM; */ return FALSE; } - req = chunk_to_msgb(&req_chunk); + req = epdg_chunk_to_msgb(&req_chunk); memcpy(msgb_put(req, sizeof(head)), &head, sizeof(head)); /* TODO: either wait here with a timeout or don't care on this stream read */ if (!stream->read_all(stream, msgb_put(req, len), len)) diff --git a/src/libcharon/plugins/osmo_epdg/osmo_epdg_db.c b/src/libcharon/plugins/osmo_epdg/osmo_epdg_db.c index cfb63d69e..c5c68df9d 100644 --- a/src/libcharon/plugins/osmo_epdg/osmo_epdg_db.c +++ b/src/libcharon/plugins/osmo_epdg/osmo_epdg_db.c @@ -55,7 +55,7 @@ METHOD(osmo_epdg_db_t, create_subscriber, osmo_epdg_ue_t *, char imsi[16] = {0}; uint32_t unique = ike_sa->get_unique_id(ike_sa); - if (get_imsi_ike(ike_sa, imsi, sizeof(imsi) - 1)) + if (epdg_get_imsi_ike(ike_sa, imsi, sizeof(imsi) - 1)) { return NULL; } @@ -102,7 +102,7 @@ METHOD(osmo_epdg_db_t, get_subscriber_ike, osmo_epdg_ue_t *, { char imsi[16] = {0}; - if (get_imsi_ike(ike_sa, imsi, sizeof(imsi))) + if (epdg_get_imsi_ike(ike_sa, imsi, sizeof(imsi))) { return NULL; } diff --git a/src/libcharon/plugins/osmo_epdg/osmo_epdg_listener.c b/src/libcharon/plugins/osmo_epdg/osmo_epdg_listener.c index 91c5a8b2b..42b2c79f4 100644 --- a/src/libcharon/plugins/osmo_epdg/osmo_epdg_listener.c +++ b/src/libcharon/plugins/osmo_epdg/osmo_epdg_listener.c @@ -56,7 +56,7 @@ METHOD(listener_t, eap_authorize, bool, DBG1(DBG_NET, "epdg: authorize: no id given. Failing."); goto err; } - if (get_imsi(id, imsi, sizeof(imsi) - 1)) + if (epdg_get_imsi(id, imsi, sizeof(imsi) - 1)) { DBG1(DBG_NET, "epdg: authorize: Can't find IMSI in EAP identity."); goto err; @@ -133,7 +133,7 @@ METHOD(listener_t, authorize, bool, goto err; } - if (get_imsi(imsi_id, imsi, sizeof(imsi) - 1)) + if (epdg_get_imsi(imsi_id, imsi, sizeof(imsi) - 1)) { DBG1(DBG_NET, "epdg: authorize: Can't find IMSI in EAP identity."); goto err; @@ -221,7 +221,7 @@ METHOD(listener_t, ike_updown, bool, private_osmo_epdg_listener_t *this, ike_sa_t *ike_sa, bool up) { char imsi[16] = {0}; - if (get_imsi_ike(ike_sa, imsi, sizeof(imsi))) + if (epdg_get_imsi_ike(ike_sa, imsi, sizeof(imsi))) { DBG1(DBG_NET, "epdg_listener: updown: imsi UNKNOWN: IKE_SA went %s", up ? "up" : "down"); return TRUE; diff --git a/src/libcharon/plugins/osmo_epdg/osmo_epdg_provider.c b/src/libcharon/plugins/osmo_epdg/osmo_epdg_provider.c index eb30df2cc..3b1da48fa 100644 --- a/src/libcharon/plugins/osmo_epdg/osmo_epdg_provider.c +++ b/src/libcharon/plugins/osmo_epdg/osmo_epdg_provider.c @@ -81,7 +81,7 @@ METHOD(simaka_provider_t, get_quintuplet, bool, char imsi[17] = {0}; ike_sa_t *ike_sa; - if (get_imsi(id, imsi, sizeof(imsi) - 1)) + if (epdg_get_imsi(id, imsi, sizeof(imsi) - 1)) { DBG1(DBG_NET, "epdg: get_quintuplet: Can't find IMSI in EAP identity."); return FALSE; @@ -94,7 +94,7 @@ METHOD(simaka_provider_t, get_quintuplet, bool, return FALSE; } - if (get_apn(ike_sa, apn, APN_MAXLEN)) + if (epdg_get_apn(ike_sa, apn, APN_MAXLEN)) { DBG1(DBG_NET, "epdg: get_quintuplet: Can't get APN."); return FALSE; diff --git a/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.c b/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.c index 46e7c0e58..972d54b1e 100644 --- a/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.c +++ b/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.c @@ -26,7 +26,7 @@ #include "osmo_epdg_utils.h" -struct msgb *chunk_to_msgb(chunk_t *chunk) +struct msgb *epdg_chunk_to_msgb(chunk_t *chunk) { struct msgb *msg; if (chunk->len < sizeof(*msg)) @@ -44,7 +44,7 @@ struct msgb *chunk_to_msgb(chunk_t *chunk) return msg; } -int get_imsi_ike(ike_sa_t *ike_sa, char *imsi, size_t imsi_len) +int epdg_get_imsi_ike(ike_sa_t *ike_sa, char *imsi, size_t imsi_len) { identification_t *imsi_id = ike_sa->get_other_id(ike_sa); if (!imsi_id) @@ -52,10 +52,10 @@ int get_imsi_ike(ike_sa_t *ike_sa, char *imsi, size_t imsi_len) return -1; } - return get_imsi(imsi_id, imsi, imsi_len); + return epdg_get_imsi(imsi_id, imsi, imsi_len); } -int get_imsi(identification_t *id, char *imsi, size_t imsi_len) +int epdg_get_imsi(identification_t *id, char *imsi, size_t imsi_len) { chunk_t nai = id->get_encoding(id); /* TODO: maybe use regex? */ @@ -77,7 +77,7 @@ int get_imsi(identification_t *id, char *imsi, size_t imsi_len) return 0; } -int validate_imsi(const char *imsi) +int epdg_validate_imsi(const char *imsi) { if (!imsi) return 1; @@ -96,7 +96,7 @@ int validate_imsi(const char *imsi) return 0; } -int validate_apn(const char *apn) +int epdg_validate_apn(const char *apn) { /* don't support empty apn */ if (!apn) @@ -108,7 +108,7 @@ int validate_apn(const char *apn) return 0; } -int get_apn(ike_sa_t *sa, char *apn, size_t apn_len) +int epdg_get_apn(ike_sa_t *sa, char *apn, size_t apn_len) { identification_t* apn_id; chunk_t apn_chunk; diff --git a/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.h b/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.h index b00fd8fc4..9cf59eaa2 100644 --- a/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.h +++ b/src/libcharon/plugins/osmo_epdg/osmo_epdg_utils.h @@ -26,12 +26,12 @@ #define IPA_ALLOC_SIZE 1200 -struct msgb *chunk_to_msgb(chunk_t *chunk); -int get_imsi(identification_t *id, char *imsi, size_t imsi_len); -int get_imsi_ike(ike_sa_t *ike_sa, char *imsi, size_t imsi_len); -int validate_imsi(const char *imsi); +struct msgb *epdg_chunk_to_msgb(chunk_t *chunk); +int epdg_get_imsi(identification_t *id, char *imsi, size_t imsi_len); +int epdg_get_imsi_ike(ike_sa_t *ike_sa, char *imsi, size_t imsi_len); +int epdg_validate_imsi(const char *imsi); -int get_apn(ike_sa_t *sa, char *apn, size_t apn_len); -int validate_apn(const char *apn); +int epdg_get_apn(ike_sa_t *sa, char *apn, size_t apn_len); +int epdg_validate_apn(const char *apn); #endif /* OSMO_EPDG_UTILS_H_ */