sipwise
/
dhtest
mirror of https://github.com/sipwise/dhtest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

replace some more occurrences of the eth format

Browse Source
changes/54/3254/1
Richard Fuchs 12 years ago
parent c749347c61
commit 18fc752f50
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File

14
functions.c
Unescape View File

@ -197,20 +197,17 @@ int send_packet(int pkt_type)
if(pkt_type == DHCP_MSGDISCOVER) { if(pkt_type == DHCP_MSGDISCOVER) {
if (!nagios_flag) { if (!nagios_flag) {
printf("DHCP discover sent\t - "); printf("DHCP discover sent\t - ");
printf("Client MAC : %02x:%02x:%02x:%02x:%02x:%02x\n", \ printf("Client MAC : " ETH_F_FMT "\n", ETH_F_ARG(dhmac));
dhmac[0], dhmac[1], dhmac[2], dhmac[3], dhmac[4], dhmac[5]);
} }
} else if (pkt_type == DHCP_MSGREQUEST) { } else if (pkt_type == DHCP_MSGREQUEST) {
if (!nagios_flag) { if (!nagios_flag) {
printf("DHCP request sent\t - "); printf("DHCP request sent\t - ");
printf("Client MAC : %02x:%02x:%02x:%02x:%02x:%02x\n", \ printf("Client MAC : " ETH_F_FMT "\n", ETH_F_ARG(dhmac));
dhmac[0], dhmac[1], dhmac[2], dhmac[3], dhmac[4], dhmac[5]);
} }
} else if (pkt_type == DHCP_MSGRELEASE) { } else if (pkt_type == DHCP_MSGRELEASE) {
if (!nagios_flag) { if (!nagios_flag) {
printf("DHCP release sent\t - "); printf("DHCP release sent\t - ");
printf("Client MAC : %02x:%02x:%02x:%02x:%02x:%02x\n", \ printf("Client MAC : " ETH_F_FMT "\n", ETH_F_ARG(dhmac));
dhmac[0], dhmac[1], dhmac[2], dhmac[3], dhmac[4], dhmac[5]);
} }
} }
} }
@ -929,9 +926,8 @@ int get_dhinfo()
return ERR_FILE_OPEN; return ERR_FILE_OPEN;
} }
fscanf(dh_file, "Client_mac: %s\nAcquired_ip: %s\nServer_id: %s\n\ fscanf(dh_file, "Client_mac: %s\nAcquired_ip: %s\nServer_id: %s\n\
Host_mac: %2X:%2X:%2X:%2X:%2X:%2X\nIP_listen: %s Pid: %d\n", mac_tmp, acq_ip_tmp, serv_id_tmp, \ Host_mac: " ETH_F_FMT "\nIP_listen: %s Pid: %d\n", mac_tmp, acq_ip_tmp, serv_id_tmp,
(u_int32_t *) &aux_dmac[0], (u_int32_t *) &aux_dmac[1], (u_int32_t *) &aux_dmac[2], ETH_F_PARG(aux_dmac),
(u_int32_t *) &aux_dmac[3], (u_int32_t *) &aux_dmac[4], (u_int32_t *) &aux_dmac[5],
ip_listen_tmp, &dh_pid); ip_listen_tmp, &dh_pid);
memcpy(dmac, aux_dmac, sizeof(dmac)); memcpy(dmac, aux_dmac, sizeof(dmac));
option50_ip = inet_addr(acq_ip_tmp); option50_ip = inet_addr(acq_ip_tmp);

3
headers.h
Unescape View File

@ -9,8 +9,9 @@
#define HEADERS_H #define HEADERS_H
#define ETH_F_FMT "%02x:%02x:%02x:%02x:%02x:%02x" #define ETH_F_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
#define ETH_F_ARG(x) (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5] #define ETH_F_ARG(x) (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5]
#define ETH_F_PARG(x) &(x)[0], &(x)[1], &(x)[2], &(x)[3], &(x)[4], &(x)[5]
/* /*
* Functions used in functions.c * Functions used in functions.c

Write Preview
Loading…
Cancel
Save