Merge remote-tracking branch 'upstream/master' into rsarwad_merge_csfb

Author: rsarwad

feg/gateway/services/testcore/hss/servicers/hss_swx_proxy_integration_test.go

@@ -24,12 +24,22 @@ import (
 )
 
 func TestMAR_Successful(t *testing.T) {
-	testMARSuccessful(t, true)
-	testMARSuccessful(t, false)
+	testMARSuccessful(t, true, false)
+	testMARSuccessful(t, false, false)
+	testMARSuccessful(t, true, true)
+	testMARSuccessful(t, false, true)
 }
 
-func testMARSuccessful(t *testing.T, verifyAuthorization bool) {
+func testMARSuccessful(t *testing.T, verifyAuthorization bool, clearAAAserver bool) {
 	hss := getTestHSSDiameterServer(t)
+	subscriber, err := hss.GetSubscriberData(context.Background(), &lteprotos.SubscriberID{Id: "sub1"})
+	assert.NoError(t, err)
+	if clearAAAserver {
+		subscriber.State.TgppAaaServerName = ""
+	}
+	_, err = hss.UpdateSubscriber(context.Background(), subscriber)
+	assert.NoError(t, err)
+
 	swxProxy := getTestSwxProxy(t, hss, verifyAuthorization, false, true)
 	mar := &fegprotos.AuthenticationRequest{
 		UserName:             "sub1",

feg/gateway/services/testcore/hss/servicers/sa.go

@@ -66,19 +66,32 @@ func NewSAA(srv *HomeSubscriberServer, msg *diam.Message) (*diam.Message, error)
 	}
 
 	answer := ConstructSuccessAnswer(msg, sar.SessionID, srv.Config.Server, diam.TGPP_SWX_APP_ID)
-	answer.NewAVP(avp.TGPPAAAServerName, avp.Mbit|avp.Vbit, diameter.Vendor3GPP, aaaServer)
 	answer.NewAVP(avp.UserName, avp.Mbit, 0, sar.UserName)
+
 	switch sar.ServerAssignmentType {
+	case servicers.ServerAssignnmentType_USER_DEREGISTRATION:
+		subscriber.State.TgppAaaServerName = ""
+		subscriber.State.TgppAaaServerRegistered = false
+		err = srv.store.UpdateSubscriber(subscriber)
+		if err != nil {
+			err = fmt.Errorf("Failed to deregister 3GPP AAA server: %v", err)
+			return ConstructFailureAnswer(msg, sar.SessionID, srv.Config.Server, uint32(diam.UnableToComply)), err
+		}
+
 	case servicers.ServerAssignmentType_REGISTRATION:
 		subscriber.State.TgppAaaServerRegistered = true
 		err = srv.store.UpdateSubscriber(subscriber)
 		if err != nil {
 			err = fmt.Errorf("Failed to register 3GPP AAA server: %v", err)
 			return ConstructFailureAnswer(msg, sar.SessionID, srv.Config.Server, uint32(diam.UnableToComply)), err
 		}
-		fallthrough
+		answer.NewAVP(avp.TGPPAAAServerName, avp.Mbit|avp.Vbit, diameter.Vendor3GPP, aaaServer)
+		answer.AddAVP(getNon3GPPUserDataAVP(subscriber.GetNon_3Gpp()))
+
 	case servicers.ServerAssignmentType_AAA_USER_DATA_REQUEST:
+		answer.NewAVP(avp.TGPPAAAServerName, avp.Mbit|avp.Vbit, diameter.Vendor3GPP, aaaServer)
 		answer.AddAVP(getNon3GPPUserDataAVP(subscriber.GetNon_3Gpp()))
+
 	default:
 		err = fmt.Errorf("server assignment type not implemented: %v", sar.ServerAssignmentType)
 		return ConstructFailureAnswer(msg, sar.SessionID, srv.Config.Server, uint32(diam.UnableToComply)), err

feg/gateway/services/testcore/hss/servicers/sa_test.go

@@ -39,6 +39,19 @@ func TestNewSAA_SuccessfulRegistration(t *testing.T) {
 	assert.True(t, subscriber.GetState().GetTgppAaaServerRegistered())
 }
 
+func TestNewSAA_SuccessfulDeregistration(t *testing.T) {
+	sar := createSAR("sub1", definitions.ServerAssignnmentType_USER_DEREGISTRATION)
+	server := test.NewTestHomeSubscriberServer(t)
+	response, err := hss.NewSAA(server, sar)
+	assert.NoError(t, err)
+	checkSAASuccessDeregistration(t, response)
+
+	subscriber, err := server.GetSubscriberData(context.Background(), &lteprotos.SubscriberID{Id: "sub1"})
+	assert.NoError(t, err)
+	assert.False(t, subscriber.GetState().GetTgppAaaServerRegistered())
+	assert.Empty(t, subscriber.GetState().TgppAaaServerName)
+}
+
 func TestNewSAA_SuccessfulUserDataRequest(t *testing.T) {
 	sar := createSAR("sub1", definitions.ServerAssignmentType_AAA_USER_DATA_REQUEST)
 	server := test.NewTestHomeSubscriberServer(t)
@@ -167,6 +180,16 @@ func checkSAASuccess(t *testing.T, response *diam.Message) {
 	assert.Equal(t, datatype.UTF8String("12345"), profile.SubscriptionId.SubscriptionIdData)
 }
 
+// checkSAASuccessDeregistration ensures that a successful SAA with a deregistration command contains all the expected data
+func checkSAASuccessDeregistration(t *testing.T, response *diam.Message) {
+	saa := testUnmarshalSAA(t, response)
+	assert.Equal(t, diam.Success, int(saa.ResultCode))
+	assert.Equal(t, datatype.DiameterIdentity(""), saa.AAAServerName)
+	assert.Equal(t, datatype.UTF8String("sub1"), saa.UserName)
+	assert.Equal(t, int32(definitions.AuthSessionState_NO_STATE_MAINTAINED), saa.AuthSessionState)
+
+}
+
 // testUnmarshalSAA unmarshals an SAA message and checks that the SessionID,
 // OriginHost, and OriginRealm fields are as expected.
 func testUnmarshalSAA(t *testing.T, response *diam.Message) definitions.SAA {

lte/cloud/go/services/cellular/utils/lte_bands.go

@@ -37,13 +37,29 @@ var bands = [...]LTEBand{
 	{ID: 4, Mode: FDDMode, StartEarfcnDl: 1950, StartEarfcnUl: 19950, CountEarfcn: 450},
 	{ID: 28, Mode: FDDMode, StartEarfcnDl: 9210, StartEarfcnUl: 27210, CountEarfcn: 450},
 	// TDDMode
+	{ID: 33, Mode: TDDMode, StartEarfcnDl: 36000, CountEarfcn: 200},
+	{ID: 34, Mode: TDDMode, StartEarfcnDl: 36200, CountEarfcn: 150},
+	{ID: 35, Mode: TDDMode, StartEarfcnDl: 36350, CountEarfcn: 600},
+	{ID: 36, Mode: TDDMode, StartEarfcnDl: 36950, CountEarfcn: 600},
+	{ID: 37, Mode: TDDMode, StartEarfcnDl: 37550, CountEarfcn: 200},
 	{ID: 38, Mode: TDDMode, StartEarfcnDl: 37750, CountEarfcn: 500},
 	{ID: 39, Mode: TDDMode, StartEarfcnDl: 38250, CountEarfcn: 400},
 	{ID: 40, Mode: TDDMode, StartEarfcnDl: 38650, CountEarfcn: 1000},
 	{ID: 41, Mode: TDDMode, StartEarfcnDl: 39650, CountEarfcn: 1940},
 	{ID: 42, Mode: TDDMode, StartEarfcnDl: 41590, CountEarfcn: 2000},
 	{ID: 43, Mode: TDDMode, StartEarfcnDl: 43590, CountEarfcn: 2000},
+	{ID: 44, Mode: TDDMode, StartEarfcnDl: 45590, CountEarfcn: 1000},
+	{ID: 45, Mode: TDDMode, StartEarfcnDl: 46590, CountEarfcn: 200},
+	{ID: 46, Mode: TDDMode, StartEarfcnDl: 46790, CountEarfcn: 7750},
+	{ID: 47, Mode: TDDMode, StartEarfcnDl: 54540, CountEarfcn: 700},
 	{ID: 48, Mode: TDDMode, StartEarfcnDl: 55240, CountEarfcn: 1500},
+	{ID: 49, Mode: TDDMode, StartEarfcnDl: 56740, CountEarfcn: 1500},
+	{ID: 50, Mode: TDDMode, StartEarfcnDl: 58240, CountEarfcn: 850},
+	{ID: 51, Mode: TDDMode, StartEarfcnDl: 59090, CountEarfcn: 50},
+	{ID: 52, Mode: TDDMode, StartEarfcnDl: 59140, CountEarfcn: 1000},
+	// Adding Band #53 require changes in the python code cause it's
+	// start_freq_dl is float value.
+	//{ID: 53, Mode: TDDMode, StartEarfcnDl: 60140, CountEarfcn: 115},
 }
 
 // EarfcnDLInRange checks that an EARFCN-DL belongs to a band

lte/cloud/go/services/cellular/utils/lte_bands_test.go

@@ -35,7 +35,7 @@ func TestGetBand(t *testing.T) {
 }
 
 func TestGetBandError(t *testing.T) {
-	expectedErr := [...]uint32{45590, 45591}
+	expectedErr := [...]uint32{60140, 60255}
 
 	for _, earfcndl := range expectedErr {
 		_, err := utils.GetBand(earfcndl)

lte/cloud/go/services/eps_authentication/servicers/test_utils/test_subscribers.go

@@ -19,13 +19,50 @@ const (
 	defaultMaxDlBitRate = uint64(200000000)
 )
 
-// GetTestSubscribers returns a slice of SubscriberData protos to be used
-// for testing authentication.
+// GetTestSubscribers returns SubscriberData protos with different settings
+// to be used for testing authentication. More users can be added.
 func GetTestSubscribers() []*protos.SubscriberData {
 	subs := make([]*protos.SubscriberData, 0)
 
+	// Default subscriber
+	sub := generateDefaultSub("sub1")
+	subs = append(subs, sub)
+
+	// Default Subs with a blank AAA server
+	sub = generateDefaultSub("sub1_noAAAsrv")
+	sub.State.TgppAaaServerName = ""
+	subs = append(subs, sub)
+
+	// Empty sub
+	sub = &protos.SubscriberData{
+		Sid:       &protos.SubscriberID{Id: "empty_sub"},
+		NetworkId: &orc8rprotos.NetworkID{Id: "test"},
+	}
+	subs = append(subs, sub)
+
+	// Subscriber without auth key
+	sub = &protos.SubscriberData{
+		Sid:       &protos.SubscriberID{Id: "missing_auth_key"},
+		NetworkId: &orc8rprotos.NetworkID{Id: "test"},
+		Lte: &protos.LTESubscription{
+			State:    protos.LTESubscription_ACTIVE,
+			AuthAlgo: protos.LTESubscription_MILENAGE,
+			AuthOpc:  []byte("\x8e'\xb6\xaf\x0ei.u\x0f2fz;\x14`]"),
+		},
+		State: &protos.SubscriberState{
+			LteAuthNextSeq:    7350,
+			TgppAaaServerName: defaultServerHost,
+		},
+	}
+	subs = append(subs, sub)
+
+	return subs
+}
+
+func generateDefaultSub(subscriberID string) *protos.SubscriberData{
+	// Default user
 	sub := &protos.SubscriberData{
-		Sid:       &protos.SubscriberID{Id: "sub1"},
+		Sid:       &protos.SubscriberID{Id: subscriberID},
 		NetworkId: &orc8rprotos.NetworkID{Id: "test"},
 		Lte: &protos.LTESubscription{
 			State:    protos.LTESubscription_ACTIVE,
@@ -64,28 +101,6 @@ func GetTestSubscribers() []*protos.SubscriberData {
 		},
 		SubProfile: "test_profile",
 	}
-	subs = append(subs, sub)
 
-	sub = &protos.SubscriberData{
-		Sid:       &protos.SubscriberID{Id: "empty_sub"},
-		NetworkId: &orc8rprotos.NetworkID{Id: "test"},
-	}
-	subs = append(subs, sub)
-
-	sub = &protos.SubscriberData{
-		Sid:       &protos.SubscriberID{Id: "missing_auth_key"},
-		NetworkId: &orc8rprotos.NetworkID{Id: "test"},
-		Lte: &protos.LTESubscription{
-			State:    protos.LTESubscription_ACTIVE,
-			AuthAlgo: protos.LTESubscription_MILENAGE,
-			AuthOpc:  []byte("\x8e'\xb6\xaf\x0ei.u\x0f2fz;\x14`]"),
-		},
-		State: &protos.SubscriberState{
-			LteAuthNextSeq:    7350,
-			TgppAaaServerName: defaultServerHost,
-		},
-	}
-	subs = append(subs, sub)
-
-	return subs
+	return sub
 }

lte/gateway/c/oai/lib/secu/nas_stream_eea1.c

@@ -2,9 +2,9 @@
  * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under 
+ * The OpenAirInterface Software Alliance licenses this file to You under
  * the Apache License, Version 2.0  (the "License"); you may not use this file
- * except in compliance with the License.  
+ * except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
@@ -41,7 +41,6 @@ int nas_stream_encrypt_eea1(
   //uint32_t                                byte_length;
   uint32_t *KS;
   uint32_t K[4], IV[4];
-  uint32_t len = 0;
 
   DevAssert(stream_cipher != NULL);
   DevAssert(stream_cipher->key != NULL);
@@ -113,8 +112,6 @@ int nas_stream_encrypt_eea1(
   }
 
   free_wrapper((void **) &KS);
-  len = sizeof(out);
-  memset(out, 0, len);
   memcpy(out, stream_cipher->message, n * 4);
 
   if (zero_bit > 0) {

lte/gateway/c/oai/lib/secu/nas_stream_eea2.c

@@ -2,9 +2,9 @@
  * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under 
+ * The OpenAirInterface Software Alliance licenses this file to You under
  * the Apache License, Version 2.0  (the "License"); you may not use this file
- * except in compliance with the License.  
+ * except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
@@ -41,7 +41,6 @@ int nas_stream_encrypt_eea2(
   uint8_t *data;
   uint32_t zero_bit = 0;
   uint32_t byte_length;
-  uint32_t len = 0;
 
   DevAssert(stream_cipher != NULL);
   DevAssert(out != NULL);
@@ -76,8 +75,6 @@ int nas_stream_encrypt_eea2(
     data[byte_length - 1] =
       data[byte_length - 1] & (uint8_t)(0xFF << (8 - zero_bit));
 
-  len = sizeof(out);
-  memset(out, 0, len);
   memcpy(out, data, byte_length);
   free_wrapper((void **) &data);
   free_wrapper((void **) &ctx);

lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c

@@ -932,9 +932,7 @@ void mme_app_handle_delete_session_rsp(
    * send pdn disconnect response to NAS.
    * NAS will trigger deactivate Bearer Context Req to UE
    */
-  if (
-    (mme_config.eps_network_feature_support.ims_voice_over_ps_session_in_s1) &&
-    (ue_context_p->emm_context.esm_ctx.is_pdn_disconnect)) {
+  if (ue_context_p->emm_context.esm_ctx.is_pdn_disconnect) {
     pdn_disconnect_rsp.ue_id = ue_context_p->mme_ue_s1ap_id;
     pdn_disconnect_rsp.lbi = delete_sess_resp_pP->lbi;
     if ((nas_proc_pdn_disconnect_rsp(&pdn_disconnect_rsp)) != RETURNok) {

lte/gateway/c/oai/tasks/mme_app/mme_app_defs.h

@@ -338,7 +338,7 @@ int map_sgs_emm_cause(SgsRejectCause_t sgs_cause);
   pthread_rwlock_wrlock(&(mMEsTATS)->rw_lock)
 #define mme_stats_unlock(mMEsTATS) pthread_rwlock_unlock(&(mMEsTATS)->rw_lock)
 
-#define mme_app_compare_tmsi(_tmsi1, _tmsi2) \
+#define MME_APP_COMPARE_TMSI(_tmsi1, _tmsi2) \
   ( \
     (_tmsi1.tmsi[0] != _tmsi2.tmsi[0]) || (_tmsi1.tmsi[1] != _tmsi2.tmsi[1]) ||\
     (_tmsi1.tmsi[2] != _tmsi2.tmsi[2]) || (_tmsi1.tmsi[3] != _tmsi2.tmsi[3])) \