ipacm: reset ext prop flag and ext_prop when received SSR event.
After SSR if we receive different number of rules than bootup,
still same number of rule is getting installed as bootup.
Reset ext prop flag ext_prop variable after SSR to install
correct number of rules.
Change-Id: Ie00ca5c70a2929b3840a11965a877f79055d7d3a
diff --git a/ipacm/inc/IPACM_Wan.h b/ipacm/inc/IPACM_Wan.h
index 29b1341..1b917c6 100644
--- a/ipacm/inc/IPACM_Wan.h
+++ b/ipacm/inc/IPACM_Wan.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -226,6 +226,13 @@
return xlat_mux_id;
}
+ static void clearExtProp()
+ {
+ IPACM_Wan::is_ext_prop_set = false;
+ IPACM_Iface::ipacmcfg->DelExtProp(IPA_IP_v4);
+ IPACM_Iface::ipacmcfg->DelExtProp(IPA_IP_v6);
+ }
+
void event_callback(ipa_cm_event_id event,
void *data);
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index cd2aae9..327982e 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -63,6 +63,7 @@
#include "IPACM_Neighbor.h"
#include "IPACM_IfaceManager.h"
#include "IPACM_Log.h"
+#include "IPACM_Wan.h"
#include "IPACM_ConntrackListener.h"
#include "IPACM_ConntrackClient.h"
@@ -715,6 +716,7 @@
continue;
case IPA_SSR_BEFORE_SHUTDOWN:
IPACMDBG_H("Received IPA_SSR_BEFORE_SHUTDOWN\n");
+ IPACM_Wan::clearExtProp();
OffloadMng = IPACM_OffloadManager::GetInstance();
if (OffloadMng->elrInstance == NULL) {
IPACMERR("OffloadMng->elrInstance is NULL, can't forward to framework!\n");