acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[Cx] fix MSISDN public identity (#921) 

sip:<MSISDN>@ims.mnc<MNC>.mcc<MCC>.3ggpnetwork.org
tel:<MSISDN>
This commit is contained in:
Sukchan Lee 2021-04-08 20:42:24 +09:00
parent 90f60cad0e
commit 3c9541992f
4 changed files with 186 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/hss/hss-context.c
View File

@ -20,6 +20,35 @@
#include "ogs-dbi.h"
#include "hss-context.h"
typedef struct hss_impi_s hss_impi_t;
typedef struct hss_imsi_s {
ogs_lnode_t lnode;
char *id;
ogs_plmn_id_t visited_plmn_id;
hss_impi_t *impi;
} hss_imsi_t;
typedef struct hss_impi_s {
ogs_lnode_t lnode;
char *id;
hss_imsi_t *imsi;
ogs_list_t impu_list;
} hss_impi_t;
typedef struct hss_impu_s {
ogs_lnode_t lnode;
char *id;
char *server_name;
hss_impi_t *impi;
} hss_impu_t;
static hss_context_t self;
static ogs_diam_config_t g_diam_conf;
@ -27,9 +56,15 @@ int __hss_log_domain;
static int context_initialized = 0;
static OGS_POOL(imsi_pool, hss_imsi_t);
static OGS_POOL(impi_pool, hss_impi_t);
static OGS_POOL(impu_pool, hss_impu_t);
static hss_imsi_t *imsi_add(char *id);
static void imsi_remove(hss_imsi_t *imsi);
static void imsi_remove_all(void);
static hss_imsi_t *imsi_find_by_id(char *id);
static hss_impi_t *impi_add(char *id);
static void impi_remove(hss_impi_t *impi);
static void impi_remove_all(void);
@ -63,9 +98,11 @@ void hss_context_init(void)
ogs_log_install_domain(&__ogs_dbi_domain, "dbi", ogs_core()->log.level);
ogs_log_install_domain(&__hss_log_domain, "hss", ogs_core()->log.level);
ogs_pool_init(&imsi_pool, ogs_app()->pool.impi);
ogs_pool_init(&impi_pool, ogs_app()->pool.impi);
ogs_pool_init(&impu_pool, ogs_app()->pool.impu);
self.imsi_hash = ogs_hash_make();
self.impi_hash = ogs_hash_make();
self.impu_hash = ogs_hash_make();
@ -79,13 +116,17 @@ void hss_context_final(void)
{
ogs_assert(context_initialized == 1);
imsi_remove_all();
impi_remove_all();
ogs_assert(self.imsi_hash);
ogs_hash_destroy(self.imsi_hash);
ogs_assert(self.impi_hash);
ogs_hash_destroy(self.impi_hash);
ogs_assert(self.impu_hash);
ogs_hash_destroy(self.impu_hash);
ogs_pool_final(&imsi_pool);
ogs_pool_final(&impi_pool);
ogs_pool_final(&impu_pool);
@ -405,6 +446,53 @@ int hss_db_ims_data(char *imsi_bcd, ogs_ims_data_t *ims_data)
return rv;
}
static hss_imsi_t *imsi_add(char *id)
{
hss_imsi_t *imsi = NULL;
ogs_assert(id);
ogs_pool_alloc(&imsi_pool, &imsi);
ogs_assert(imsi);
memset(imsi, 0, sizeof *imsi);
imsi->id = ogs_strdup(id);
ogs_assert(imsi->id);
ogs_hash_set(self.imsi_hash, imsi->id, strlen(imsi->id), imsi);
ogs_list_add(&self.imsi_list, imsi);
return imsi;
}
static void imsi_remove(hss_imsi_t *imsi)
{
ogs_assert(imsi);
ogs_list_remove(&self.imsi_list, imsi);
ogs_assert(imsi->id);
ogs_hash_set(self.imsi_hash, imsi->id, strlen(imsi->id), NULL);
ogs_free(imsi->id);
ogs_pool_free(&imsi_pool, imsi);
}
static void imsi_remove_all(void)
{
hss_imsi_t *imsi = NULL, *next = NULL;
ogs_list_for_each_safe(&self.imsi_list, next, imsi)
imsi_remove(imsi);
}
static hss_imsi_t *imsi_find_by_id(char *id)
{
ogs_assert(id);
return (hss_imsi_t *)ogs_hash_get(self.imsi_hash, id, strlen(id));
}
static hss_impi_t *impi_add(char *id)
{
hss_impi_t *impi = NULL;
@ -437,9 +525,6 @@ static void impi_remove(hss_impi_t *impi)
ogs_hash_set(self.impi_hash, impi->id, strlen(impi->id), NULL);
ogs_free(impi->id);
if (impi->imsi_bcd)
ogs_free(impi->imsi_bcd);
ogs_pool_free(&impi_pool, impi);
}
@ -542,6 +627,26 @@ static hss_impu_t *impu_find_by_impi_and_id(hss_impi_t *impi, char *id)
return NULL;
}
void hss_s6a_set_visited_plmn_id(char *imsi_bcd, ogs_plmn_id_t *visited_plmn_id)
{
hss_imsi_t *imsi = NULL;
ogs_assert(imsi_bcd);
ogs_assert(visited_plmn_id);
ogs_thread_mutex_lock(&self.cx_lock);
imsi = imsi_find_by_id(imsi_bcd);
if (!imsi) {
imsi = imsi_add(imsi_bcd);
ogs_assert(imsi);
}
memcpy(&imsi->visited_plmn_id, visited_plmn_id, OGS_PLMN_ID_LEN);
ogs_thread_mutex_unlock(&self.cx_lock);
}
void hss_cx_associate_identity(char *user_name, char *public_identity)
{
hss_impi_t *impi = NULL;
@ -589,6 +694,27 @@ bool hss_cx_identity_is_associated(char *user_name, char *public_identity)
return match_result;
}
void hss_cx_set_imsi_bcd(char *user_name, char *imsi_bcd)
{
hss_imsi_t *imsi = NULL;
hss_impi_t *impi = NULL;
ogs_assert(user_name);
ogs_assert(imsi_bcd);
ogs_thread_mutex_lock(&self.cx_lock);
impi = impi_find_by_id(user_name);
ogs_assert(impi);
imsi = imsi_find_by_id(imsi_bcd);
ogs_assert(imsi);
impi->imsi = imsi;
ogs_thread_mutex_unlock(&self.cx_lock);
}
char *hss_cx_get_imsi_bcd(char *public_identity)
{
hss_impi_t *impi = NULL;
@ -603,33 +729,36 @@ char *hss_cx_get_imsi_bcd(char *public_identity)
impi = impu->impi;
ogs_assert(impi);
imsi_bcd = impi->imsi_bcd;
if (impi->imsi)
imsi_bcd = impi->imsi->id;
}
ogs_thread_mutex_unlock(&self.cx_lock);
return imsi_bcd;;
return imsi_bcd;
}
void hss_cx_set_imsi_bcd(char *user_name, char *imsi_bcd)
ogs_plmn_id_t *hss_cx_get_visited_plmn_id(char *public_identity)
{
hss_impi_t *impi = NULL;
hss_impu_t *impu = NULL;
ogs_assert(user_name);
ogs_assert(imsi_bcd);
ogs_plmn_id_t *visited_plmn_id = NULL;
ogs_thread_mutex_lock(&self.cx_lock);
impi = impi_find_by_id(user_name);
ogs_assert(impi);
impu = impu_find_by_id(public_identity);
if (impu) {
impi = impu->impi;
ogs_assert(impi);
if (impi->imsi_bcd)
ogs_free(impi->imsi_bcd);
impi->imsi_bcd = ogs_strdup(imsi_bcd);
ogs_assert(impi->imsi_bcd);
if (impi->imsi)
visited_plmn_id = &impi->imsi->visited_plmn_id;
}
ogs_thread_mutex_unlock(&self.cx_lock);
return visited_plmn_id;
}
char *hss_cx_get_server_name(char *public_identity)
@ -688,7 +817,8 @@ void hss_cx_set_server_name(
ogs_thread_mutex_unlock(&self.cx_lock);
}
char *hss_cx_download_user_data(char *user_name, ogs_ims_data_t *ims_data)
char *hss_cx_download_user_data(
char *user_name, ogs_plmn_id_t *plmn_id, ogs_ims_data_t *ims_data)
{
char *user_data = NULL;
@ -699,13 +829,17 @@ char *hss_cx_download_user_data(char *user_name, ogs_ims_data_t *ims_data)
int i;
ogs_assert(user_name);
ogs_assert(plmn_id);
ogs_assert(ims_data);
/* Download User-Data */
for (i = 0; i < ims_data->num_of_msisdn; i++) {
char *public_identity = NULL;
public_identity = ogs_msprintf("sip:%s", ims_data->msisdn[i].bcd);
public_identity = ogs_msprintf(
"sip:%s@ims.mnc%03d.mcc%03d.3gppnetwork.org",
ims_data->msisdn[i].bcd,
ogs_plmn_id_mnc(plmn_id), ogs_plmn_id_mcc(plmn_id));
ogs_assert(public_identity);
hss_cx_associate_identity(user_name, public_identity);
ogs_free(public_identity);

33
src/hss/hss-context.h
View File

@ -41,29 +41,16 @@ typedef struct _hss_context_t {
ogs_thread_mutex_t db_lock;
ogs_thread_mutex_t cx_lock;
/* S6A Interface */
ogs_list_t imsi_list;
ogs_hash_t *imsi_hash; /* hash table (IMSI) */
/* CX Interface */
ogs_list_t impi_list;
ogs_hash_t *impi_hash; /* hash table (IMPI) */
ogs_hash_t *impu_hash; /* hash table (IMPU) */
} hss_context_t;
typedef struct hss_impi_s {
ogs_lnode_t lnode;
char *id;
char *imsi_bcd;
ogs_list_t impu_list;
} hss_impi_t;
typedef struct hss_impu_s {
ogs_lnode_t lnode;
char *id;
char *server_name;
hss_impi_t *impi;
} hss_impu_t;
void hss_context_init(void);
void hss_context_final(void);
hss_context_t *hss_self(void);
@ -82,17 +69,23 @@ int hss_db_msisdn_data(
int hss_db_ims_data(char *imsi_bcd, ogs_ims_data_t *ims_data);
void hss_s6a_set_visited_plmn_id(
char *imsi_bcd, ogs_plmn_id_t *visited_plmn_id);
void hss_cx_associate_identity(char *user_name, char *public_identity);
bool hss_cx_identity_is_associated(char *user_name, char *public_identity);
char *hss_cx_get_imsi_bcd(char *public_identity);
void hss_cx_set_imsi_bcd(char *user_name, char *imsi_bcd);
char *hss_cx_get_imsi_bcd(char *public_identity);
ogs_plmn_id_t *hss_cx_get_visited_plmn_id(char *public_identity);
char *hss_cx_get_server_name(char *public_identity);
void hss_cx_set_server_name(
char *public_identity, char *server_name, bool overwrite);
char *hss_cx_download_user_data(char *user_name, ogs_ims_data_t *ims_data);
char *hss_cx_download_user_data(
char *user_name, ogs_plmn_id_t *plmn_id, ogs_ims_data_t *ims_data);
#ifdef __cplusplus

13
src/hss/hss-cx-path.c
View File

@ -603,6 +603,7 @@ static int hss_ogs_diam_cx_sar_cb( struct msg **msg, struct avp *avp,
char *user_data = NULL;
char *imsi_bcd = NULL;
ogs_plmn_id_t *visited_plmn_id = NULL;
ogs_ims_data_t ims_data;
@ -664,6 +665,15 @@ static int hss_ogs_diam_cx_sar_cb( struct msg **msg, struct avp *avp,
goto out;
}
/* Check if IMSI */
visited_plmn_id = hss_cx_get_visited_plmn_id(public_identity);
if (!visited_plmn_id) {
ogs_error("Cannot find PLMN-ID for User-Name[%s] Public-Identity[%s]",
user_name, public_identity);
result_code = OGS_DIAM_CX_ERROR_IDENTITY_NOT_REGISTERED;
goto out;
}
/* DB : HSS IMS Service Profile */
memset(&ims_data, 0, sizeof(ogs_ims_data_t));
rv = hss_db_ims_data(imsi_bcd, &ims_data);
@ -714,7 +724,8 @@ static int hss_ogs_diam_cx_sar_cb( struct msg **msg, struct avp *avp,
/* Nothing to do */
} else {
/* Set the User-Data AVP */
user_data = hss_cx_download_user_data(user_name, &ims_data);
user_data = hss_cx_download_user_data(
user_name, visited_plmn_id, &ims_data);
ogs_assert(user_data);
ret = fd_msg_avp_new(ogs_diam_cx_user_data, 0, &avp);

16
src/hss/hss-s6a-path.c
View File

@ -69,6 +69,8 @@ static int hss_ogs_diam_s6a_air_cb( struct msg **msg, struct avp *avp,
int rv;
uint32_t result_code = 0;
ogs_plmn_id_t visited_plmn_id;
ogs_assert(msg);
ogs_debug("Authentication-Information-Request");
@ -155,9 +157,9 @@ static int hss_ogs_diam_s6a_air_cb( struct msg **msg, struct avp *avp,
ogs_assert(ret == 0);
ret = fd_msg_avp_hdr(avp, &hdr);
ogs_assert(ret == 0);
#if 0 // TODO : check visited_plmn_id
memcpy(visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
#endif
memcpy(&visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
hss_s6a_set_visited_plmn_id(imsi_bcd, &visited_plmn_id);
milenage_generate(opc, auth_info.amf, auth_info.k,
ogs_uint64_to_buffer(auth_info.sqn, OGS_SQN_LEN, sqn), auth_info.rand,
@ -286,6 +288,8 @@ static int hss_ogs_diam_s6a_ulr_cb( struct msg **msg, struct avp *avp,
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
ogs_plmn_id_t visited_plmn_id;
ogs_assert(msg);
ogs_debug("Update-Location-Request");
@ -316,9 +320,9 @@ static int hss_ogs_diam_s6a_ulr_cb( struct msg **msg, struct avp *avp,
ogs_assert(ret == 0);
ret = fd_msg_avp_hdr(avp, &hdr);
ogs_assert(ret == 0);
#if 0 // TODO : check visited_plmn_id
memcpy(visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
#endif
memcpy(&visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
hss_s6a_set_visited_plmn_id(imsi_bcd, &visited_plmn_id);
/* Set the Origin-Host, Origin-Realm, andResult-Code AVPs */
ret = fd_msg_rescode_set(ans, (char*)"DIAMETER_SUCCESS", NULL, NULL, 1);