From 53821f9c9e1eba16cd369b1f7e1c051f8935a2e2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 2 Aug 2017 19:10:31 +0200 Subject: small renames in kernel.c --- src/kernel/kernel.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index d870375..460cb74 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -458,29 +458,29 @@ void handle_network_event( network_event_t *event, void *context ) { network_ethernet_packet_t *packet = (network_ethernet_packet_t *)event->data; - char src[NETWORK_ETHERNET_MAC_ADDR_STRING]; - char dst[NETWORK_ETHERNET_MAC_ADDR_STRING]; - network_mac_address_to_string( packet->header.src_addr, src, NETWORK_ETHERNET_MAC_ADDR_STRING ); - network_mac_address_to_string( packet->header.dst_addr, dst, NETWORK_ETHERNET_MAC_ADDR_STRING ); + char src_mac_addr[NETWORK_ETHERNET_MAC_ADDR_STRING]; + char dst_mac_addr[NETWORK_ETHERNET_MAC_ADDR_STRING]; + network_mac_address_to_string( packet->header.src_addr, src_mac_addr, NETWORK_ETHERNET_MAC_ADDR_STRING ); + network_mac_address_to_string( packet->header.dst_addr, dst_mac_addr, NETWORK_ETHERNET_MAC_ADDR_STRING ); printf( "NETWORK DATA: src: %s, dst: %s, len: %d, type: %X\n", - src, dst, + src_mac_addr, dst_mac_addr, event->length, packet->header.type ); if( packet->header.type == NETWORK_ETHER_PROTOCOL_TYPE_ARP ) { network_arp_packet_t *arp = (network_arp_packet_t *)&packet->data; - char src2[NETWORK_PROTOCOL_IPV4_ADDR_STRING]; - char dst2[NETWORK_PROTOCOL_IPV4_ADDR_STRING]; + char src_ip[NETWORK_PROTOCOL_IPV4_ADDR_STRING]; + char dst_ip[NETWORK_PROTOCOL_IPV4_ADDR_STRING]; - network_mac_address_to_string( arp->source_hardware_address, src, NETWORK_ETHERNET_MAC_ADDR_STRING ); - network_mac_address_to_string( arp->destination_hardware_address, dst, NETWORK_ETHERNET_MAC_ADDR_STRING ); - network_ipv4_address_to_string( arp->source_protocol_address, src2, NETWORK_PROTOCOL_IPV4_ADDR_STRING ); - network_ipv4_address_to_string( arp->destination_protocol_address, dst2, NETWORK_PROTOCOL_IPV4_ADDR_STRING ); + network_mac_address_to_string( arp->source_hardware_address, src_mac_addr, NETWORK_ETHERNET_MAC_ADDR_STRING ); + network_mac_address_to_string( arp->destination_hardware_address, dst_mac_addr, NETWORK_ETHERNET_MAC_ADDR_STRING ); + network_ipv4_address_to_string( arp->source_protocol_address, src_ip, NETWORK_PROTOCOL_IPV4_ADDR_STRING ); + network_ipv4_address_to_string( arp->destination_protocol_address, dst_ip, NETWORK_PROTOCOL_IPV4_ADDR_STRING ); printf( "ARP: hw src: %s, dst: %s, ip src: %s, dst: %s, oper: %d\n", - src, dst, src2, dst2, arp->operation ); + src_mac_addr, dst_mac_addr, src_ip, dst_ip, arp->operation ); } - // we must free if data if we no longer need it + // we must free the data if we no longer need it free( event->data ); } -- cgit v1.2.3-54-g00ecf