iface: Store and export ca_info

Store and export ca_info. We don't do anything special with the data, so
just store it as a string and create a new object. We could even just
copy the object.

Author: kristrev

metadata_exporter.h

@@ -187,6 +187,7 @@ struct md_iface_event {
     const char *ip_addr;
     const char *internal_ip_addr;
     const char *ifname;
+    const char *ca_info;
     uint32_t imsi_mccmnc;
     uint32_t nw_mccmnc;
     int32_t cid;

metadata_input_nl_zmq_common.c

@@ -82,62 +82,65 @@ uint8_t parse_conn_info(struct json_object *meta_obj, struct md_conn_event *mce,
 uint8_t parse_iface_event(struct json_object *meta_obj, struct md_iface_event *mie, struct md_exporter *parent)
 {
     json_object_object_foreach(meta_obj, key, val) {
-        if (!strcmp(key, "md_seq"))
+        if (!strcmp(key, "md_seq")) {
             mie->sequence = (uint16_t) json_object_get_int(val);
-        else if (!strcmp(key, "timestamp"))
+        } else if (!strcmp(key, "timestamp")) {
             mie->tstamp = json_object_get_int64(val);
-        else if (!strcmp(key, "event_param"))
+        } else if (!strcmp(key, "event_param")) {
             mie->event_param = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "event_type"))
+        } else if (!strcmp(key, "event_type")) {
             mie->event_type = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "iccid"))
+        } else if (!strcmp(key, "iccid")) {
             mie->iccid = json_object_get_string(val);
-        else if (!strcmp(key, "imsi"))
+        } else if (!strcmp(key, "imsi")) {
             mie->imsi = json_object_get_string(val);
-        else if (!strcmp(key, "imei"))
+        } else if (!strcmp(key, "imei")) {
             mie->imei = json_object_get_string(val);
-        else if (!strcmp(key, "ip_addr"))
+        } else if (!strcmp(key, "ip_addr")) {
             mie->ip_addr = json_object_get_string(val);
-        else if (!strcmp(key, "internal_ip_addr"))
+        } else if (!strcmp(key, "internal_ip_addr")) {
             mie->internal_ip_addr = json_object_get_string(val);
-        else if (!strcmp(key, "isp_name"))
+        } else if (!strcmp(key, "isp_name")) {
             mie->isp_name = json_object_get_string(val);
-        else if (!strcmp(key, "ifname"))
+        } else if (!strcmp(key, "ifname")) {
             mie->ifname = json_object_get_string(val);
-        else if (!strcmp(key, "imsi_mccmnc"))
+        } else if (!strcmp(key, "imsi_mccmnc")) {
             mie->imsi_mccmnc = (uint32_t) json_object_get_int(val);
-        else if (!strcmp(key, "network_mccmnc"))
+        } else if (!strcmp(key, "network_mccmnc")) {
             mie->nw_mccmnc = (uint32_t) json_object_get_int(val);
-        else if (!strcmp(key, "cid"))
+        } else if (!strcmp(key, "cid")) {
             mie->cid = json_object_get_int(val);
-        else if (!strcmp(key, "device_mode"))
+        } else if (!strcmp(key, "device_mode")) {
             mie->device_mode = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "device_sub_mode"))
+        } else if (!strcmp(key, "device_sub_mode")) {
             mie->device_submode = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "rssi"))
+        } else if (!strcmp(key, "rssi")) {
             mie->rssi = (int8_t) json_object_get_int(val);
-        else if (!strcmp(key, "ecio"))
+        } else if (!strcmp(key, "ecio")) {
             mie->ecio = (int8_t) json_object_get_int(val);
-        else if (!strcmp(key, "rscp"))
+        } else if (!strcmp(key, "rscp")) {
             mie->rscp = (int16_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_rssi"))
+        } else if (!strcmp(key, "lte_rssi")) {
             mie->lte_rssi = (int8_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_rsrp"))
+        } else if (!strcmp(key, "lte_rsrp")) {
             mie->lte_rsrp = (int16_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_rsrq"))
+        } else if (!strcmp(key, "lte_rsrq")) {
             mie->lte_rsrq = (int8_t) json_object_get_int(val);
-        else if (!strcmp(key, "lac"))
+        } else if (!strcmp(key, "lac")) {
             mie->lac = (uint16_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_band"))
+        } else if (!strcmp(key, "lte_band")) {
             mie->lte_band = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_freq"))
+        } else if (!strcmp(key, "lte_freq")) {
             mie->lte_freq = (uint16_t) json_object_get_int(val);
-        else if (!strcmp(key, "lte_pci"))
+        } else if (!strcmp(key, "lte_pci")) {
             mie->lte_pci = (uint16_t) json_object_get_int(val);
-        else if (!strcmp(key, "device_state"))
+        } else if (!strcmp(key, "device_state")) {
             mie->device_state = (uint8_t) json_object_get_int(val);
-        else if (!strcmp(key, "enodeb_id"))
+        } else if (!strcmp(key, "enodeb_id")) {
             mie->enodeb_id = json_object_get_int(val);
+        } else if (!strcmp(key, "ca_info")) {
+            mie->ca_info = json_object_to_json_string_ext(val, JSON_C_TO_STRING_PLAIN);
+        }
     }
 
     return RETVAL_SUCCESS;

metadata_writer_file.c

@@ -62,6 +62,20 @@ static int md_file_add_json_string(struct json_object *obj,
     return RETVAL_SUCCESS;
 }
 
+static int md_file_add_json_obj(struct json_object *obj,
+        const char *key, const char *value)
+{
+    struct json_object *obj_to_add = json_tokener_parse(value);
+
+    if (!obj_to_add) {
+        return RETVAL_FAILURE;
+    }
+
+    json_object_object_add(obj, key, obj_to_add);
+
+    return RETVAL_SUCCESS;
+}
+
 static int md_file_save(struct md_writer_file *mwf, int event_type, const char *content)
 {
     int output_fd;
@@ -132,7 +146,8 @@ static void md_file_handle_iface_event(struct md_writer_file *mwf,
         (mie->cid != DEFAULT_CID && md_file_add_json_int(obj, "cid", mie->cid)) ||
         (mie->enodeb_id != DEFAULT_ENODEBID && md_file_add_json_int(obj, "enodeb_id", mie->enodeb_id)) ||
         (mie->lac != DEFAULT_LAC && md_file_add_json_int(obj, "lac", mie->lac)) ||
-        (mie->device_state != DEFAULT_DEVICE_STATE && md_file_add_json_int(obj, "device_state", mie->device_state))) {
+        (mie->device_state != DEFAULT_DEVICE_STATE && md_file_add_json_int(obj, "device_state", mie->device_state)) ||
+        (mie->ca_info && md_file_add_json_obj(obj, "ca_info", mie->ca_info))) {
         META_PRINT_SYSLOG(mwf->parent, LOG_ERR, "md_file_handle_iface_event: Can't create iface values to object!");
         json_object_put(obj);
         return;