output/json: make JSONFormatAndAddMACAddr public

This change exposes 'JSONFormatAndAddMACAddr' as a public function,
allowing it to be reused across modules, such as the ARP logger, for logging
MAC addresses extracted from ARP packets.

diff --git a/src/output-json.c b/src/output-json.c
index 6709657269e4c1ad30681674da36d57ce43e516c..bd345b72c443dea3170296f57d98d4132498ab10 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -705,8 +705,7 @@ void CreateEveFlowId(JsonBuilder *js, const Flow *f)
     }
 }
 
-static inline void JSONFormatAndAddMACAddr(
-        JsonBuilder *js, const char *key, const uint8_t *val, bool is_array)
+void JSONFormatAndAddMACAddr(JsonBuilder *js, const char *key, const uint8_t *val, bool is_array)
 {
     char eth_addr[19];
     (void) snprintf(eth_addr, 19, "%02x:%02x:%02x:%02x:%02x:%02x",

diff --git a/src/output-json.h b/src/output-json.h
index 531740b2cdfa37c7536062c15e969e7d33ce2919..85502d748f6cde9fe316ac920dfbed71e8e8e6b4 100644 (file)
--- a/src/output-json.h
+++ b/src/output-json.h
@@ -116,5 +116,6 @@ int OutputJSONMemBufferCallback(const char *str, size_t size, void *data);
 
 OutputJsonThreadCtx *CreateEveThreadCtx(ThreadVars *t, OutputJsonCtx *ctx);
 void FreeEveThreadCtx(OutputJsonThreadCtx *ctx);
+void JSONFormatAndAddMACAddr(JsonBuilder *js, const char *key, const uint8_t *val, bool is_array);
 
 #endif /* SURICATA_OUTPUT_JSON_H */