rename session_get0_readable_addr() to session_get_readable_addr()

7 files changed, 15 insertions, 15 deletions

diff --git a/test/decoders/http/http_test_plug.cpp b/test/decoders/http/http_test_plug.cpp
index d91b552..8085ab2 100644
--- a/test/decoders/http/http_test_plug.cpp
+++ b/test/decoders/http/http_test_plug.cpp
@@ -313,10 +313,10 @@ static void http_decoder_test_update_session_tuple4(struct session *sess, struct
 {
     if (gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] == NULL)
     {
-        const char *human_addr_cstr = session_get0_readable_addr(sess);
+        const char *human_addr_cstr = session_get_readable_addr(sess);
         if (NULL == human_addr_cstr)
         {
-            fprintf(stderr, "can't get readable_addr, to use session_get0_readable_addr() the sapp_log.conf level must <= INFO\n");
+            fprintf(stderr, "can't get readable_addr, to use session_get_readable_addr() the sapp_log.conf level must <= INFO\n");
             return;
         }
         char result_name[MAX_KEY_STR_LEN] = {0};
@@ -596,7 +596,7 @@ extern "C" void http_decoder_tunnel_entry(struct session *sess, int topic_id, co
             gtest_plug_exdata = (struct gtest_plug_exdata_t *)calloc(1, sizeof(struct gtest_plug_exdata_t));
             session_exdata_set(sess, g_exdata_idx, gtest_plug_exdata);
         }
-        const char *human_addr_cstr = session_get0_readable_addr(sess);
+        const char *human_addr_cstr = session_get_readable_addr(sess);
         gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_REQ] = cJSON_CreateObject();
         gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_RES] = cJSON_CreateObject();
         gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] = cJSON_CreateObject();
diff --git a/test/decoders/session_flags/dummy.c b/test/decoders/session_flags/dummy.c
index 9b9a050..a00cc12 100644
--- a/test/decoders/session_flags/dummy.c
+++ b/test/decoders/session_flags/dummy.c
@@ -73,7 +73,7 @@ enum flow_type session_get_flow_type(const struct session *sess)
 	return FLOW_TYPE_C2S;
 }
 
-const char *session_get0_readable_addr(const struct session *sess)
+const char *session_get_readable_addr(const struct session *sess)
 {
 	UNUSED(sess);
 
diff --git a/test/decoders/socks/dummy.c b/test/decoders/socks/dummy.c
index 86e4070..5a51ea8 100644
--- a/test/decoders/socks/dummy.c
+++ b/test/decoders/socks/dummy.c
@@ -95,7 +95,7 @@ int session_mq_publish_message(struct session *sess, int topic_id, void *msg)
 	return 0;
 }
 
-const char *session_get0_readable_addr(const struct session *sess)
+const char *session_get_readable_addr(const struct session *sess)
 {
 	UNUSED(sess);
 
diff --git a/test/decoders/stratum/stratum_test_plugin.cpp b/test/decoders/stratum/stratum_test_plugin.cpp
index 3ec563b..f0378c0 100644
--- a/test/decoders/stratum/stratum_test_plugin.cpp
+++ b/test/decoders/stratum/stratum_test_plugin.cpp
@@ -44,7 +44,7 @@ void test_stratum_decoder_on_message(struct session *session, int topic_id, cons
     cJSON *stratum_json = cJSON_CreateObject();
     cJSON_AddItemToObject(root, "stratum", stratum_json);
 
-    cJSON_AddStringToObject(stratum_json, "Tuple4", session_get0_readable_addr(session));
+    cJSON_AddStringToObject(stratum_json, "Tuple4", session_get_readable_addr(session));
     cJSON_AddStringToObject(stratum_json, "type", stratum->type == ETH ? "ETH" : "OTHER");
     cJSON_AddStringToObject(stratum_json, "mining_pools", (char *)stratum->mining_pools.iov_base);
     cJSON_AddStringToObject(stratum_json, "mining_program", (char *)stratum->mining_program.iov_base);
diff --git a/test/lpi_plus/gtest_lpip_module.c b/test/lpi_plus/gtest_lpip_module.c
index 49382a8..5897108 100644
--- a/test/lpi_plus/gtest_lpip_module.c
+++ b/test/lpi_plus/gtest_lpip_module.c
@@ -58,7 +58,7 @@ static void gtest_lpip_exdata_free(int idx __attribute__((unused)), void *ex_ptr
     if(env==NULL || test_appid_exdata ==NULL)return;
 
     cJSON *ctx = cJSON_CreateObject();
-    cJSON_AddStringToObject(ctx, "Tuple4", session_get0_readable_addr(test_appid_exdata->sess));
+    cJSON_AddStringToObject(ctx, "Tuple4", session_get_readable_addr(test_appid_exdata->sess));
     enum session_type type = session_get_type(test_appid_exdata->sess);
     if (type == SESSION_TYPE_TCP)
     {
diff --git a/test/packet_inject/packet_inject.c b/test/packet_inject/packet_inject.c
index 260babd..1b812c2 100644
--- a/test/packet_inject/packet_inject.c
+++ b/test/packet_inject/packet_inject.c
@@ -422,14 +422,14 @@ static void build_and_send_tcp_packet(struct inject_plugin_ctx *ctx, struct sess
 static void *on_sess_new(struct session *sess, void *plugin_ctx)
 {
     struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx;
-    INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session new: %s", session_get0_readable_addr(sess));
+    INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session new: %s", session_get_readable_addr(sess));
     return NULL;
 }
 
 static void on_sess_free(struct session *sess, void *sess_ctx, void *plugin_ctx)
 {
     struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx;
-    INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session free: %s", session_get0_readable_addr(sess));
+    INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session free: %s", session_get_readable_addr(sess));
 }
 
 static void on_sess_msg(struct session *sess, int topic_id, const void *msg, void *sess_ctx, void *plugin_ctx)
@@ -445,7 +445,7 @@ static void on_sess_msg(struct session *sess, int topic_id, const void *msg, voi
     struct config *config = &ctx->config;
     enum flow_type type = session_get_flow_type(sess);
     INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session msg: %s (C2S received packets: %lu, S2C received packets: %lu)",
-                            session_get0_readable_addr(sess),
+                            session_get_readable_addr(sess),
                             session_get_stat(sess, FLOW_TYPE_C2S, STAT_RAW_PACKETS_RECEIVED),
                             session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED));
 
diff --git a/test/session_debugger/session_debugger.c b/test/session_debugger/session_debugger.c
index 710b288..cb9c833 100644
--- a/test/session_debugger/session_debugger.c
+++ b/test/session_debugger/session_debugger.c
@@ -109,22 +109,22 @@ static struct session_debugger_exdata *session_debugger_exdata_new(struct sessio
     if (session_get_type(sess) == SESSION_TYPE_TCP)
     {
         memset(buff, 0, sizeof(buff));
-        sprintf(buff, "./log/session_debugger.TCP_%s_C2S.hexdump", session_get0_readable_addr(sess));
+        sprintf(buff, "./log/session_debugger.TCP_%s_C2S.hexdump", session_get_readable_addr(sess));
         exdata->c2s_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
 
         memset(buff, 0, sizeof(buff));
-        sprintf(buff, "./log/session_debugger.TCP_%s_S2C.hexdump", session_get0_readable_addr(sess));
+        sprintf(buff, "./log/session_debugger.TCP_%s_S2C.hexdump", session_get_readable_addr(sess));
         exdata->s2c_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
     }
 
     if (session_get_type(sess) == SESSION_TYPE_UDP)
     {
         memset(buff, 0, sizeof(buff));
-        sprintf(buff, "./log/session_debugger.UDP_%s_C2S.hexdump", session_get0_readable_addr(sess));
+        sprintf(buff, "./log/session_debugger.UDP_%s_C2S.hexdump", session_get_readable_addr(sess));
         exdata->c2s_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
 
         memset(buff, 0, sizeof(buff));
-        sprintf(buff, "./log/session_debugger.UDP_%s_S2C.hexdump", session_get0_readable_addr(sess));
+        sprintf(buff, "./log/session_debugger.UDP_%s_S2C.hexdump", session_get_readable_addr(sess));
         exdata->s2c_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
     }
 
@@ -198,7 +198,7 @@ static void on_session_closed(struct session *sess, void *arg)
              exdata->s2c_rx_tcp_seg, exdata->s2c_rx_tcp_bytes,
              exdata->c2s_rx_udp_payload, exdata->c2s_rx_udp_bytes,
              exdata->s2c_rx_udp_payload, exdata->s2c_rx_udp_bytes);
-    session_debugger_log(exdata->dbg->fd, "session %lu %s statistics:\n%s", session_get_id(exdata->sess), session_get0_readable_addr(exdata->sess), buff);
+    session_debugger_log(exdata->dbg->fd, "session %lu %s statistics:\n%s", session_get_id(exdata->sess), session_get_readable_addr(exdata->sess), buff);
 }
 
 static void on_session_message(struct session *sess, enum session_state state, struct packet *pkt, void *arg)