emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up parameter names and comment read_interface().

Browse Source
This commit is contained in:
Nicholas J. Kain 2010-11-14 00:41:32 -05:00
parent 987ba12982
commit 86ef084835
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ndhc/socket.c
View File

@ -38,8 +38,9 @@
#include "strl.h" #include "strl.h"
#include "dhcpd.h" /* For SERVER_PORT and CLIENT_PORT */ #include "dhcpd.h" /* For SERVER_PORT and CLIENT_PORT */
int read_interface(char *interface, int *ifindex, uint32_t *addr, /* Given an interface name in @interface, return its index number,
unsigned char *arp) * IPv4 address, and MAC in @ifindex, @addr (optional), and @mac.*/
int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *mac)
{ {
int fd, ret = -1; int fd, ret = -1;
struct ifreq ifr; struct ifreq ifr;
@ -78,9 +79,9 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr,
goto out_fd; goto out_fd;
} }
memcpy(arp, ifr.ifr_hwaddr.sa_data, 6); memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
log_line("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", log_line("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
ret = 0; ret = 0;
out_fd: out_fd:
close(fd); close(fd);

3
ndhc/socket.h
View File

@ -2,7 +2,8 @@
#ifndef SOCKET_H_ #ifndef SOCKET_H_
#define SOCKET_H_ #define SOCKET_H_
int read_interface(char *interface, int *ifindex, uint32_t *addr, unsigned char *arp); int read_interface(char *interface, int *ifindex, uint32_t *addr,
uint8_t *mac);
int listen_socket(unsigned int ip, int port, char *inf); int listen_socket(unsigned int ip, int port, char *inf);
int raw_socket(int ifindex); int raw_socket(int ifindex);