Commit 31a47387 authored by Simon Pastor's avatar Simon Pastor
Browse files

zone status crash and rnis oldPlmn fix

parent 1c7ab162

go-apps/meep-loc-serv/server/loc-serv.go

+28 −28
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ func checkNotificationRegisteredZoneStatus(zoneId string, apId string, nbUsersIn 
				if nbUsersInZone >= zoneStatus.NbUsersInZoneThreshold {

					zoneWarning = true

				}

			}

				if nbUsersInAPStr != "" {

					nbUsersInAP, _ = strconv.Atoi(nbUsersInAPStr)

					if nbUsersInAP >= zoneStatus.NbUsersInAPThreshold {
@@ -349,6 +348,7 @@ func checkNotificationRegisteredZoneStatus(zoneId string, apId string, nbUsersIn 
			}

		}

	}

}



func checkNotificationRegisteredUsers(oldZoneId string, newZoneId string, oldApId string, newApId string, userId string) {

go-apps/meep-rnis/server/rnis.go

+4 −4
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ func checkReNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				match = false

			}



			if match && ((sub.FilterCriteria.Plmn == nil) || (sub.FilterCriteria.Plmn != nil && (newPlmn != nil && newPlmn.Mnc == sub.FilterCriteria.Plmn.Mnc && newPlmn.Mcc == sub.FilterCriteria.Plmn.Mcc))) {

			if match && (((sub.FilterCriteria.Plmn == nil) || (sub.FilterCriteria.Plmn != nil && (newPlmn != nil && newPlmn.Mnc == sub.FilterCriteria.Plmn.Mnc && newPlmn.Mcc == sub.FilterCriteria.Plmn.Mcc))) && (oldPlmn == nil || oldCellId == "")) {

				match = true

			} else {

				match = false
@@ -649,7 +649,7 @@ func checkRrNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				match = false

			}



			if match && (((sub.FilterCriteria.Plmn == nil) || (sub.FilterCriteria.Plmn != nil && (newPlmn != nil && newPlmn.Mnc == sub.FilterCriteria.Plmn.Mnc && newPlmn.Mcc == sub.FilterCriteria.Plmn.Mcc))) && (newPlmn == nil || newCellId == "")) {

			if match && (((sub.FilterCriteria.Plmn == nil) || (sub.FilterCriteria.Plmn != nil && (oldPlmn != nil && oldPlmn.Mnc == sub.FilterCriteria.Plmn.Mnc && oldPlmn.Mcc == sub.FilterCriteria.Plmn.Mcc))) && (newPlmn == nil || newCellId == "")) {

				match = true

			} else {

				match = false
@@ -692,8 +692,8 @@ func checkRrNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				var oldEcgi clientNotif.Ecgi



				var notifOldPlmn clientNotif.Plmn

				notifOldPlmn.Mnc = newPlmn.Mnc

				notifOldPlmn.Mcc = newPlmn.Mcc

				notifOldPlmn.Mnc = oldPlmn.Mnc

				notifOldPlmn.Mcc = oldPlmn.Mcc

				oldEcgi.Plmn = &notifOldPlmn

				oldEcgi.CellId = []string{oldCellId}