@@ -69,6 +69,8 @@ char updtmpdir[512], dbdir[512];

 int sigchld_wait = 1;

 const char *pidfile = NULL;

+void submit_host_info(struct optstruct *opts);

+

 static void

 sighandler (int sig)

 {

@@ -331,6 +333,8 @@ main (int argc, char **argv)

         return 0;

     }

+    submit_host_info(opts);

+

     if (optget (opts, "HTTPProxyPassword")->enabled)

     {

         if (CLAMSTAT (cfgfile, &statbuf) == -1)

@@ -726,3 +730,32 @@ main (int argc, char **argv)

     return (ret);

 }

+

+void submit_host_info(struct optstruct *opts)

+{

+    struct optstruct *opt;

+    struct cl_engine *engine;

+    cli_intel_t *intel;

+

+    engine = cl_engine_new();

+    if (!(engine))

+        return;

+

+    intel = engine->stats_data;

+    if (!(intel)) {

+        engine->cb_stats_submit = NULL;

+        cl_engine_free(engine);

+        return;

+    }

+

+    intel->host_info = calloc(1, strlen(TARGET_OS_TYPE) + strlen(TARGET_ARCH_TYPE) + 2);

+    if (!(intel->host_info)) {

+        engine->cb_stats_submit = NULL;

+        cl_engine_free(engine);

+        return;

+    }

+

+    sprintf(intel->host_info, "%s %s", TARGET_OS_TYPE, TARGET_ARCH_TYPE);

+

+    cl_engine_free(engine);

+}

@@ -79,6 +79,9 @@ char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel)

     bufsz = JSON_BUFSZ;

     sprintf(buf, "{\n\t\"hostid\": \"%s\",\n", hostid);

+    if (intel->host_info)

+        sprintf(buf+strlen(buf), "\t\"host_info\": \"%s\",\n", intel->host_info);

+

     sprintf(buf+strlen(buf), "\t\"samples\": [\n");

     curused = strlen(buf);

@@ -159,6 +159,7 @@ typedef struct cli_flagged_sample {

 typedef struct cli_clamav_intel {

     char *hostid;

+    char *host_info;

     cli_flagged_sample_t *samples;

     uint32_t nsamples;

     uint32_t maxsamples;