Skip to content
Snippets Groups Projects
Commit 04171679 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

Rename function

So it does not clash with one in another library. The dynamic linker got
confused :-(.
parent c1dfd34b
No related branches found
No related tags found
No related merge requests found
......@@ -314,7 +314,7 @@ static void packet_handler(struct pcap_interface *interface, const struct pcap_p
.direction = interface->in ? DIR_IN : DIR_OUT
};
ulog(LLOG_DEBUG_VERBOSE, "Packet of size %zu on interface %s (starting %016llX%016llX, on layer %d)\n", info.length, interface->name, *(long long unsigned *) info.data, *(1 + (long long unsigned *) info.data), interface->datalink);
parse_packet(&info, interface->loop->batch_pool, interface->datalink);
uc_parse_packet(&info, interface->loop->batch_pool, interface->datalink);
LFOR(plugin, plugin, &interface->loop->plugins)
plugin_packet(plugin, &info);
}
......
......@@ -111,7 +111,7 @@ static void parse_internal(struct packet_info *packet, struct mem_pool *pool) {
next->length = length_rest;
next->interface = packet->interface;
next->direction = packet->direction;
parse_packet(next, pool, DLT_RAW);
uc_parse_packet(next, pool, DLT_RAW);
return; // And we're done (no ports here)
case 6: // TCP
if (length_rest < sizeof *tcp_ports)
......@@ -216,7 +216,7 @@ static void parse_ethernet(struct packet_info *packet, struct mem_pool *pool) {
IP:
packet->app_protocol = 'I';
// Parse the IP part
parse_packet(next, pool, DLT_RAW);
uc_parse_packet(next, pool, DLT_RAW);
break;
case 0x0806: // ARP
packet->app_protocol = 'A';
......@@ -234,7 +234,7 @@ static void parse_ethernet(struct packet_info *packet, struct mem_pool *pool) {
}
}
void parse_packet(struct packet_info *packet, struct mem_pool *pool, int datalink) {
void uc_parse_packet(struct packet_info *packet, struct mem_pool *pool, int datalink) {
switch (datalink) {
case DLT_EN10MB: // Ethernet II
packet->layer = 'E';
......
......@@ -109,7 +109,7 @@ struct packet_info {
* Parse the stuff in the passed packet. It expects length and data are already
* set, it fills the addresses, protocols, etc.
*/
void parse_packet(struct packet_info *packet, struct mem_pool *pool, int datalink) __attribute__((nonnull));
void uc_parse_packet(struct packet_info *packet, struct mem_pool *pool, int datalink) __attribute__((nonnull));
/*
* Which endpoint is the remote one for the given direction?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment