Add link_type to mimic show and lock file

Author: hack3ric

Diff for: common/defs.h

@@ -277,11 +277,11 @@ enum link_type {
 static inline const char* link_type_str(enum link_type link) {
   switch (link) {
     case LINK_ETH:
-      return N_("Ethernet");
+      return "eth";
     case LINK_NONE:
-      return N_("None");
+      return "none";
     default:
-      return N_("(unknown)");
+      return "(unknown)";
   }
 }
 

Diff for: src/config.c

@@ -127,7 +127,7 @@ static int parse_bool(const char* str, __s16* result) {
   return 0;
 }
 
-int parse_link(const char* str, enum link_type* link) {
+int parse_link_type(const char* str, enum link_type* link) {
   if (strcmp("eth", str) == 0)
     *link = LINK_ETH;
   else if (strcmp("none", str) == 0)
@@ -282,6 +282,9 @@ int parse_config_file(FILE* file, struct run_args* args) {
       }
       log_verbosity = parsed;
 
+    } else if (strcmp(k, "link_type") == 0) {
+      try(parse_link_type(v, &args->link_type));
+
     } else if (strcmp(k, "filter") == 0) {
       unsigned int fc = args->filter_count;
       ret = parse_filter(v, &args->filters[fc], &args->info[fc], sizeof_array(args->filters) - fc);
@@ -333,6 +336,8 @@ int parse_lock_file(FILE* file, struct lock_content* c) {
       version_checked = true;
     } else if (strcmp(k, "pid") == 0)
       try(parse_int_any(v, &c->pid));
+    else if (strcmp(k, "link_type") == 0)
+      try(parse_link_type(v, &c->link_type));
     else if (strcmp(k, "egress_id") == 0)
       try(parse_int_any(v, &c->egress_id));
     else if (strcmp(k, "ingress_id") == 0)
@@ -351,6 +356,7 @@ int parse_lock_file(FILE* file, struct lock_content* c) {
 int write_lock_file(int fd, const struct lock_content* c) {
   try(dprintf(fd, "version=%s\n", argp_program_version));
   try(dprintf(fd, "pid=%d\n", c->pid));
+  try(dprintf(fd, "link_type=%s\n", link_type_str(c->link_type)));
   try(dprintf(fd, "egress_id=%d\n", c->egress_id));
   try(dprintf(fd, "ingress_id=%d\n", c->ingress_id));
   try(dprintf(fd, "whitelist_id=%d\n", c->whitelist_id));

Diff for: src/main.h

@@ -44,19 +44,19 @@ extern const struct argp show_argp;
 
 int subcmd_run(struct run_args* args);
 
-int show_overview(int ifindex, int whitelist_fd, struct filter_settings* gsettings,
-                  int log_verbosity);
+int show_overview(int ifindex, enum link_type link_type, int whitelist_fd,
+                  struct filter_settings* gsettings, int log_verbosity);
 int subcmd_show(struct show_args* args);
 
 struct lock_content {
   pid_t pid;
-  enum link_type link;
+  enum link_type link_type;
   int egress_id, ingress_id;
   int whitelist_id, conns_id;
   struct filter_settings settings;
 };
 
-int parse_link(const char* str, enum link_type* link);
+int parse_link_type(const char* str, enum link_type* link);
 int parse_handshake(char* str, struct filter_handshake* h);
 int parse_keepalive(char* str, struct filter_keepalive* k);
 int parse_padding(const char* str, __s16* padding);

Diff for: src/run.c

@@ -84,7 +84,7 @@ static inline error_t args_parse_opt(int key, char* arg, struct argp_state* stat
         args->filter_count += ret;
       break;
     case 'L':
-      try(parse_link(arg, &args->link_type));
+      try(parse_link_type(arg, &args->link_type));
       break;
     case 'x':
       args->xdp_mode = try(parse_xdp_mode(arg));
@@ -592,6 +592,7 @@ static inline int run_bpf(struct run_args* args, int lock_fd, const char* ifname
   // Save state to lock file
   struct lock_content lock_content = {
     .pid = getpid(),
+    .link_type = args->link_type,
     .egress_id = _get_prog_id(egress_handler),
     .ingress_id = _get_prog_id(ingress_handler),
     .whitelist_id = _get_map_id(mimic_whitelist),
@@ -622,7 +623,7 @@ static inline int run_bpf(struct run_args* args, int lock_fd, const char* ifname
   if (args->filter_count <= 0)
     log_warn(_("no filter specified"));
   else
-    show_overview(ifindex, mimic_whitelist_fd, &args->gsettings, log_verbosity);
+    show_overview(ifindex, args->link_type, mimic_whitelist_fd, &args->gsettings, log_verbosity);
 
   struct epoll_event ev;
   struct epoll_event events[EPOLL_MAX_EVENTS];

Diff for: src/show.c

@@ -54,10 +54,14 @@ const struct argp show_argp = {
   N_("\vSee mimic(1) for detailed usage."),
 };
 
-int show_overview(int ifindex, int whitelist_fd, struct filter_settings* gs, int log_verbosity) {
+int show_overview(int ifindex, enum link_type link_type, int whitelist_fd,
+                  struct filter_settings* gs, int log_verbosity) {
   if (log_verbosity >= 0 && !LOG_ALLOW_INFO) return 0;
   FILE* out = log_verbosity >= 0 ? stderr : stdout;
 
+  if (LOG_ALLOW_INFO) fprintf(out, "%s%s " RESET, log_prefixes[2][0], log_prefixes[2][1]);
+  fprintf(out, _("  %sLink Type:%s %s\n"), BOLD, RESET, link_type_str(link_type));
+
   struct bpf_xdp_query_opts xdp_opts = {.sz = sizeof(xdp_opts)};
   try(bpf_xdp_query(ifindex, 0, &xdp_opts), _("failed to query XDP: %s"), strret);
   if (LOG_ALLOW_INFO) fprintf(out, "%s%s " RESET, log_prefixes[2][0], log_prefixes[2][1]);
@@ -173,7 +177,7 @@ int subcmd_show(struct show_args* args) {
     int whitelist_fd raii(closep) =
       try(bpf_map_get_fd_by_id(lock_content.whitelist_id), _("failed to get fd of map '%s': %s"),
           "mimic_whitelist", strret);
-    show_overview(ifindex, whitelist_fd, &lock_content.settings, -1);
+    show_overview(ifindex, lock_content.link_type, whitelist_fd, &lock_content.settings, -1);
     printf("\n");
   }