optimizate: clean up unused code && code formatting

This commit is contained in:
luwenpeng
2024-08-14 10:50:33 +08:00
parent 927d0cd344
commit 6e1c25a445
20 changed files with 61 additions and 86 deletions

View File

@@ -105,6 +105,7 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
return 0;
}
int old = 0;
int used = 0;
memset(buff, 0, size);
used += snprintf(buff + used, size - used, "packet: %p, data_ptr: %p, data_len: %u, trim_len: %u, layers_used: %d, layers_size: %d\n",
@@ -116,11 +117,11 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
used += snprintf(buff + used, size - used, "layer[%u]: %p, proto: %s, header: {offset: %u, ptr: %p, len: %u}, payload: {ptr: %p, len: %u}\n",
i, layer, layer_proto_to_str(layer->proto), layer->hdr_offset,
layer->hdr_ptr, layer->hdr_len, layer->pld_ptr, layer->pld_len);
old = used;
switch (layer->proto)
{
case LAYER_PROTO_ETHER:
used += eth_hdr_to_str((const struct ethhdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_PWETH:
break;
@@ -128,39 +129,31 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
break;
case LAYER_PROTO_L2TP:
used += l2tp_hdr_to_str((const struct l2tp_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_VLAN:
used += vlan_hdr_to_str((const struct vlan_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_PPPOE:
break;
case LAYER_PROTO_MPLS:
used += mpls_label_to_str((const struct mpls_label *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPV4:
used += ip4_hdr_to_str((const struct ip *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPV6:
used += ip6_hdr_to_str((const struct ip6_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPAH:
break;
case LAYER_PROTO_GRE:
used += gre_hdr_to_str(layer->hdr_ptr, layer->hdr_len, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_UDP:
used += udp_hdr_to_str((const struct udphdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_TCP:
used += tcp_hdr_to_str((const struct tcphdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_ICMP:
break;
@@ -168,16 +161,18 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
break;
case LAYER_PROTO_VXLAN:
used += vxlan_hdr_to_str((const struct vxlan_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_GTP_C:
case LAYER_PROTO_GTP_U:
used += gtp_hdr_to_str(layer->hdr_ptr, layer->hdr_len, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
default:
break;
}
if (old != used)
{
used += snprintf(buff + used, size - used, "\n");
}
}
return used;