diff --git a/ipmitool/lib/ipmi_session.c b/ipmitool/lib/ipmi_session.c index f050195..4e4e96b 100644 --- a/ipmitool/lib/ipmi_session.c +++ b/ipmitool/lib/ipmi_session.c @@ -97,19 +97,11 @@ print_session_info_csv(const struct get_session_info_rsp * session_info, if (data_len == 18) { /* 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", inet_ntop(AF_INET, &(session_info->channel_data.lan_data.console_ip), buffer, 16)); -#endif printf(",%02x:%02x:%02x:%02x:%02x:%02x", 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", 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", inet_ntop(AF_INET, &(session_info->channel_data.modem_data.console_ip), buffer, 16)); -#endif if (data_len == 14) { @@ -201,19 +185,11 @@ print_session_info_verbose(const struct get_session_info_rsp * session_info, if (data_len == 18) { /* 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", inet_ntop(AF_INET, &(session_info->channel_data.lan_data.console_ip), buffer, 16)); -#endif printf("console mac : %02x:%02x:%02x:%02x:%02x:%02x\n", 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", 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", inet_ntop(AF_INET, &(session_info->channel_data.modem_data.console_ip), buffer, 16)); -#endif if (data_len == 14) { diff --git a/ipmitool/lib/ipmi_tsol.c b/ipmitool/lib/ipmi_tsol.c index bb1d5f2..e98ccdc 100644 --- a/ipmitool/lib/ipmi_tsol.c +++ b/ipmitool/lib/ipmi_tsol.c @@ -430,13 +430,8 @@ ipmi_tsol_main(struct ipmi_intf * intf, int argc, char ** argv) sin.sin_family = AF_INET; 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, &intf->session->addr.sin_addr); -#endif if (result <= 0) { struct hostent *host = gethostbyname((const char *)intf->session->hostname); diff --git a/ipmitool/src/plugins/lan/lan.c b/ipmitool/src/plugins/lan/lan.c index 05ca03c..13e482d 100644 --- a/ipmitool/src/plugins/lan/lan.c +++ b/ipmitool/src/plugins/lan/lan.c @@ -1410,11 +1410,7 @@ int ipmi_lan_open(struct ipmi_intf * intf) s->addr.sin_family = AF_INET; 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); -#endif if (rc <= 0) { struct hostent *host = gethostbyname(s->hostname); if (host == NULL) { diff --git a/ipmitool/src/plugins/lanplus/lanplus.c b/ipmitool/src/plugins/lanplus/lanplus.c index da2f4cb..af2607e 100644 --- a/ipmitool/src/plugins/lanplus/lanplus.c +++ b/ipmitool/src/plugins/lanplus/lanplus.c @@ -3248,11 +3248,7 @@ ipmi_lanplus_open(struct ipmi_intf * intf) addr.sin_family = AF_INET; 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); -#endif if (rc <= 0) { struct hostent *host = gethostbyname(session->hostname); if (host == NULL) {