deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 11:07:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove CYGWIN defines for older cygwin support

Browse Source
This commit is contained in:
Duncan Laurie 2006-01-15 21:21:49 +00:00
parent d4a64e17f2
commit 73d088de1f
4 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipmitool/lib/ipmi_session.c
View File

@ -97,19 +97,11 @@ print_session_info_csv(const struct get_session_info_rsp * session_info,
if (data_len == 18) if (data_len == 18)
{ {
/* We have 802.3 LAN data */ /* We have 802.3 LAN data */
#ifdef __CYGWIN__
printf(",%d.%d.%d.%d",
session_info->channel_data.lan_data.console_ip[0],
session_info->channel_data.lan_data.console_ip[1],
session_info->channel_data.lan_data.console_ip[2],
session_info->channel_data.lan_data.console_ip[3]);
#else
printf(",%s", printf(",%s",
inet_ntop(AF_INET, inet_ntop(AF_INET,
&(session_info->channel_data.lan_data.console_ip), &(session_info->channel_data.lan_data.console_ip),
buffer, buffer,
16)); 16));
#endif
printf(",%02x:%02x:%02x:%02x:%02x:%02x", printf(",%02x:%02x:%02x:%02x:%02x:%02x",
session_info->channel_data.lan_data.console_mac[0], session_info->channel_data.lan_data.console_mac[0],
@ -137,19 +129,11 @@ print_session_info_csv(const struct get_session_info_rsp * session_info,
printf(",%d", printf(",%d",
session_info->channel_data.modem_data.destination_selector); session_info->channel_data.modem_data.destination_selector);
#ifdef __CYGWIN__
printf(",%d.%d.%d.%d",
session_info->channel_data.modem_data.console_ip[0],
session_info->channel_data.modem_data.console_ip[1],
session_info->channel_data.modem_data.console_ip[2],
session_info->channel_data.modem_data.console_ip[3]);
#else
printf(",%s", printf(",%s",
inet_ntop(AF_INET, inet_ntop(AF_INET,
&(session_info->channel_data.modem_data.console_ip), &(session_info->channel_data.modem_data.console_ip),
buffer, buffer,
16)); 16));
#endif
if (data_len == 14) if (data_len == 14)
{ {
@ -201,19 +185,11 @@ print_session_info_verbose(const struct get_session_info_rsp * session_info,
if (data_len == 18) if (data_len == 18)
{ {
/* We have 802.3 LAN data */ /* We have 802.3 LAN data */
#ifdef __CYGWIN__
printf("console ip : %d.%d.%d.%d\n",
session_info->channel_data.lan_data.console_ip[0],
session_info->channel_data.lan_data.console_ip[1],
session_info->channel_data.lan_data.console_ip[2],
session_info->channel_data.lan_data.console_ip[3]);
#else
printf("console ip : %s\n", printf("console ip : %s\n",
inet_ntop(AF_INET, inet_ntop(AF_INET,
&(session_info->channel_data.lan_data.console_ip), &(session_info->channel_data.lan_data.console_ip),
buffer, buffer,
16)); 16));
#endif
printf("console mac : %02x:%02x:%02x:%02x:%02x:%02x\n", printf("console mac : %02x:%02x:%02x:%02x:%02x:%02x\n",
session_info->channel_data.lan_data.console_mac[0], session_info->channel_data.lan_data.console_mac[0],
@ -241,19 +217,11 @@ print_session_info_verbose(const struct get_session_info_rsp * session_info,
printf("Destination selector : %d\n", printf("Destination selector : %d\n",
session_info->channel_data.modem_data.destination_selector); session_info->channel_data.modem_data.destination_selector);
#ifdef __CYGWIN__
printf("console ip : %d.%d.%d.%d\n",
session_info->channel_data.modem_data.console_ip[0],
session_info->channel_data.modem_data.console_ip[1],
session_info->channel_data.modem_data.console_ip[2],
session_info->channel_data.modem_data.console_ip[3]);
#else
printf("console ip : %s\n", printf("console ip : %s\n",
inet_ntop(AF_INET, inet_ntop(AF_INET,
&(session_info->channel_data.modem_data.console_ip), &(session_info->channel_data.modem_data.console_ip),
buffer, buffer,
16)); 16));
#endif
if (data_len == 14) if (data_len == 14)
{ {

5
ipmitool/lib/ipmi_tsol.c
View File

@ -430,13 +430,8 @@ ipmi_tsol_main(struct ipmi_intf * intf, int argc, char ** argv)
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_port = htons(port); sin.sin_port = htons(port);
#ifdef __CYGWIN__
result = inet_aton((const char *)intf->session->hostname,
&intf->session->addr.sin_addr);
#else
result = inet_pton(AF_INET, (const char *)intf->session->hostname, result = inet_pton(AF_INET, (const char *)intf->session->hostname,
&intf->session->addr.sin_addr); &intf->session->addr.sin_addr);
#endif
if (result <= 0) { if (result <= 0) {
struct hostent *host = gethostbyname((const char *)intf->session->hostname); struct hostent *host = gethostbyname((const char *)intf->session->hostname);

4
ipmitool/src/plugins/lan/lan.c
View File

@ -1410,11 +1410,7 @@ int ipmi_lan_open(struct ipmi_intf * intf)
s->addr.sin_family = AF_INET; s->addr.sin_family = AF_INET;
s->addr.sin_port = htons(s->port); s->addr.sin_port = htons(s->port);
#ifdef __CYGWIN__
rc = inet_aton(s->hostname, &s->addr.sin_addr);
#else
rc = inet_pton(AF_INET, s->hostname, &s->addr.sin_addr); rc = inet_pton(AF_INET, s->hostname, &s->addr.sin_addr);
#endif
if (rc <= 0) { if (rc <= 0) {
struct hostent *host = gethostbyname(s->hostname); struct hostent *host = gethostbyname(s->hostname);
if (host == NULL) { if (host == NULL) {

4
ipmitool/src/plugins/lanplus/lanplus.c
View File

@ -3248,11 +3248,7 @@ ipmi_lanplus_open(struct ipmi_intf * intf)
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(session->port); addr.sin_port = htons(session->port);
#ifdef __CYGWIN__
rc = inet_aton(session->hostname, &addr.sin_addr);
#else
rc = inet_pton(AF_INET, session->hostname, &addr.sin_addr); rc = inet_pton(AF_INET, session->hostname, &addr.sin_addr);
#endif
if (rc <= 0) { if (rc <= 0) {
struct hostent *host = gethostbyname(session->hostname); struct hostent *host = gethostbyname(session->hostname);
if (host == NULL) { if (host == NULL) {