TSG-23925 Supports scanning of source_zone and destination_zone, and removes internal and external

2 files changed, 1 insertions, 22 deletions

diff --git a/common/include/tfe_resource.h b/common/include/tfe_resource.h
index a35e5cf..2a25474 100644
--- a/common/include/tfe_resource.h
+++ b/common/include/tfe_resource.h
@@ -38,29 +38,7 @@ struct library_tag_ctx
 void app_id_dict_free(struct app_id_dict *app_dict);
 void library_tag_free(struct library_tag_ctx *library_tags);
 
-enum scan_common_table
-{
-	PXY_CTRL_SOURCE_IP,
-	PXY_CTRL_DESTINATION_IP,
-	PXY_CTRL_INTERNAL_IP,
-	PXY_CTRL_EXTERNAL_IP,
-	PXY_CTRL_SOURCE_PORT,
-	PXY_CTRL_DESTINATION_PORT,
-	PXY_CTRL_INTERNAL_PORT,
-	PXY_CTRL_EXTERNAL_PORT,
-	PXY_CTRL_IP_PROTOCOL,
-    PXY_CTRL_SUBSCRIBER_ID,
-    PXY_CTRL_APP_ID_DICT,
-	PXY_CTRL_LIBRARY_TAG,
-	PXY_CTRL_IMSI,
-	PXY_CTRL_APN,
-	PXY_CTRL_PHONE_NUMBER,
-	PXY_CTRL_GTP_IMEI,
-	__SCAN_COMMON_TABLE_MAX
-};
-
 int tfe_env_init();
-int tfe_bussiness_tableid_get(enum scan_common_table type);
 
 int tfe_get_vsys_id();
 const char *tfe_get_device_id();
diff --git a/common/include/tfe_scan.h b/common/include/tfe_scan.h
index 67a6740..1669c0b 100644
--- a/common/include/tfe_scan.h
+++ b/common/include/tfe_scan.h
@@ -12,5 +12,6 @@ int tfe_scan_ipv4_addr(const struct tfe_stream *stream, uuid_t *result, struct m
 int tfe_scan_ipv6_addr(const struct tfe_stream *stream, uuid_t *result, struct maat_state *scan_mid, int hit_cnt, struct ipaddr sapp_addr);
 int tfe_scan_port(const struct tfe_stream *stream, uuid_t *result, struct maat_state *scan_mid, int hit_cnt, uint16_t source, uint16_t dest);
 int tfe_scan_device(const struct tfe_stream *stream, uuid_t *result, struct maat_state *scan_mid, int hit_cnt, void *logger);
+int tfe_scan_zone(const struct tfe_stream *stream, uuid_t *result, struct maat_state *scan_mid, int hit_cnt);
 
 int tfe_get_library_tags(const struct tfe_stream *stream, cJSON *common_obj, tfe_cmsg_tlv_type tlv_type, const char *tag_key);