Skip to content

Commit

Permalink
Merge branch 'master' into pcrf
Browse files Browse the repository at this point in the history
  • Loading branch information
@thakurajayL
thakurajayL authored Nov 5, 2021
2 parents 1f89f48 + 771c0c3 commit 3299ddd
Show file tree
Hide file tree
Showing 15 changed files with 1,161 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG CPUS
WORKDIR /c3po
COPY install_builddeps.sh .
COPY modules modules
COPY patches patches
COPY patches patches

RUN ./install_builddeps.sh
RUN rm -rf /c3po-libs && mkdir -p /c3po-libs && \
Expand Down
2 changes: 1 addition & 1 deletion hss/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Perform the following procedures in order.

$ cd {isntallation_root}/c3po/hss
$ make

3. Update the following files with any configuration changes:

{installation_root}/c3po/hss/conf/hss.conf
Expand Down
1 change: 1 addition & 0 deletions hss/db/oai_db.cql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS vhss.users_imsi (
rfsp_index varint,
sqn bigint,
subscription_data text,
supported_features text,
ue_reachability varint,
urrp_mme varint,
user_identifier text,
Expand Down
1 change: 0 additions & 1 deletion hss/hssperf/src/s6as6d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ Dictionary::Dictionary()
m_avp_ext_pdp_address( "Ext-PDP-Address", m_vnd_3gpp.getId() ),
m_avp_regional_subscription_zone_code( "Regional-Subscription-Zone-Code", m_vnd_3gpp.getId() )
{
std::cout << "Registering s6as6d dictionary" << std::endl;
};

Dictionary::~Dictionary()
Expand Down
70 changes: 68 additions & 2 deletions hss/include/dataaccess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,75 @@ class DAEventIdList : public std::list<DAEventId*>
}
};

class ImsiEntity
{
public:
ImsiEntity()
{
imsi = ""; imsi_pres = false;
idmmeidentity = 0; idmmeidentity_pres = false;
imei = ""; imei_pres = false;
imei_sv = ""; imei_sv_pres = false;
key = ""; key_pres = false;
lipa_permissions = ""; lipa_permissions_pres = false;
mmeidentity_idmmeidentity = 0; mmeidentity_idmmeidentity_pres = false;
mme_cap = 0; mme_cap_pres = false;
mmehost = ""; mmehost_pres = false;
mmerealm = ""; mmerealm_pres = false;
ms_ps_status = ""; ms_ps_status_pres = false;
msisdn = 0; msisdn_pres = false;
niddvalidity = ""; niddvalidity_pres = false;
nir_dest_host = ""; nir_dest_host_pres = false;
nir_dest_realm = ""; nir_dest_realm_pres = false;
opc = ""; opc_pres = false;
pgw_id = 0; pgw_id_pres = false;
rand = ""; rand_pres = false;
rfsp_index = 0; rfsp_index_pres = false;
sqn = 0; sqn_pres = false;
subscription_data = ""; subscription_data_pres = false;
supported_features = ""; supported_features_pres = false;
ue_reachability = 0; ue_reachability_pres = false;
urrp_mme = 0; urrp_mme_pres = false;
user_identifier = ""; user_identifier_pres = false;
visited_plmnid = ""; visited_plmnid_pres = false;
access_restriction = 0; access_restriction_pres = false;
}
std::string imsi; bool imsi_pres;
int32_t access_restriction; bool access_restriction_pres;
int32_t idmmeidentity; bool idmmeidentity_pres;
std::string imei; bool imei_pres;
std::string imei_sv; bool imei_sv_pres;
std::string key; bool key_pres;
std::string lipa_permissions; bool lipa_permissions_pres;
int32_t mme_cap; bool mme_cap_pres;
std::string mmehost; bool mmehost_pres;
int32_t mmeidentity_idmmeidentity; bool mmeidentity_idmmeidentity_pres;
std::string mmerealm; bool mmerealm_pres;
std::string ms_ps_status; bool ms_ps_status_pres;
int64_t msisdn; bool msisdn_pres;
std::string niddvalidity; bool niddvalidity_pres;
std::string nir_dest_host; bool nir_dest_host_pres;
std::string nir_dest_realm; bool nir_dest_realm_pres;
std::string opc; bool opc_pres;
int32_t pgw_id; bool pgw_id_pres;
std::string rand; bool rand_pres;
int32_t rfsp_index; bool rfsp_index_pres;
int32_t sqn; bool sqn_pres;
std::string subscription_data; bool subscription_data_pres;
std::string supported_features; bool supported_features_pres;
int32_t ue_reachability; bool ue_reachability_pres;
int32_t urrp_mme; bool urrp_mme_pres;
std::string user_identifier; bool user_identifier_pres;
std::string visited_plmnid; bool visited_plmnid_pres;
};

struct DAImsiInfo {
std::string imsi;
std::string mmehost;
std::string imsi;
std::string mmehost;
std::string mmerealm;
std::string ms_ps_status;
std::string subscription_data;
std::string supported_features;
int64_t msisdn;
std::string str_msisdn;
std::string visited_plmnid;
Expand Down Expand Up @@ -193,6 +256,9 @@ class DataAccess
bool getImsiInfo ( const char *imsi, DAImsiInfo &info, CassFutureCallback cb, void *data );
bool getImsiInfo ( const std::string &imsi, DAImsiInfo &info, CassFutureCallback cb, void *data ) { return getImsiInfo( imsi.c_str(), info, cb, data ); }

bool deleteUserImsi(const ImsiEntity &ie, CassFutureCallback cb, void *data);
bool insertUserImsi(const ImsiEntity &ie, CassFutureCallback cb, void *data);

bool getEventIdsFromMsisdnData( SCassFuture &future, DAEventIdList &el );
bool getEventIdsFromMsisdn( int64_t msisdn, DAEventIdList &el, CassFutureCallback cb, void *data );

Expand Down
3 changes: 3 additions & 0 deletions hss/include/fdhss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ class FDHss {

void sendRIR_ChangeImsiImeiSvAssn(ImsiImeiData &data);

void poppulate_IMSIs(const ImsiEntity &ie);
void remove_IMSI(const ImsiEntity &ie);

s6t::Application *gets6tApp() { return m_s6tapp; }
s6as6d::Application *gets6as6dApp() { return m_s6aapp; }
s6c::Application *gets6cApp() { return m_s6capp; }
Expand Down
Loading

0 comments on commit 3299ddd

Please sign in to comment.