diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-01-11 14:47:47 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-01-11 14:47:47 +0000 |
| commit | 9ffde4355023022ec03cc832f7122a6423982d75 (patch) | |
| tree | 040696aca9d1e47f9d416b40b0dd9fd4cafd10e9 /ui/gtk/capture_if_details_dlg_win32.c | |
| parent | 8326a9294295ca889aca0397cc27dba80f287f6c (diff) | |
| download | wireshark-9ffde4355023022ec03cc832f7122a6423982d75.tar.gz | |
Replace gtk_table...() with ws_gtk_grid...();
Also: Do general cleanup:
- #if 0 unused value_strings and unused functions;
- Whitespace, formatting style, long-lines, etc.
svn path=/trunk/; revision=47029
Diffstat (limited to 'ui/gtk/capture_if_details_dlg_win32.c')
| -rw-r--r-- | ui/gtk/capture_if_details_dlg_win32.c | 1678 |
1 files changed, 841 insertions, 837 deletions
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index 9a5de12a83..423a25b91c 100644 --- a/ui/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -148,11 +148,11 @@ struct sockaddr_storage { /* and are not part of the ntddndis.h file delivered with WinPcap */ /* Required OIDs */ -#define OID_GEN_VLAN_ID 0x0001021C +#define OID_GEN_VLAN_ID 0x0001021C /* Optional OIDs */ -#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 -#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 +#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 +#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 /* Optional OIDs */ #define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 @@ -161,8 +161,8 @@ struct sockaddr_storage { /* Currently associated SSID (OID_802_11_SSID) */ #define NDIS_ESSID_MAX_SIZE 32 struct ndis_essid { - ULONG length; - UCHAR essid[NDIS_ESSID_MAX_SIZE+1]; + ULONG length; + UCHAR essid[NDIS_ESSID_MAX_SIZE+1]; }; @@ -173,39 +173,39 @@ typedef UCHAR ndis_rates[NDIS_MAX_RATES_EX]; /* configuration, e.g. frequency (OID_802_11_CONFIGURATION / OID_802_11_BSSID_LIST) */ struct /*packed*/ ndis_configuration { - ULONG length; - ULONG beacon_period; - ULONG atim_window; - ULONG ds_config; - struct ndis_configuration_fh { - ULONG length; - ULONG hop_pattern; - ULONG hop_set; - ULONG dwell_time; - } fh_config; + ULONG length; + ULONG beacon_period; + ULONG atim_window; + ULONG ds_config; + struct ndis_configuration_fh { + ULONG length; + ULONG hop_pattern; + ULONG hop_set; + ULONG dwell_time; + } fh_config; }; /* bssid list item (OID_802_11_BSSID_LIST) */ struct ndis_ssid_item { - ULONG length; - mac_address mac; - UCHAR reserved[2]; - struct ndis_essid ssid; - ULONG privacy; - LONG rssi; - UINT net_type; - struct ndis_configuration config; - UINT mode; - ndis_rates rates; - ULONG ie_length; - UCHAR ies[1]; + ULONG length; + mac_address mac; + UCHAR reserved[2]; + struct ndis_essid ssid; + ULONG privacy; + LONG rssi; + UINT net_type; + struct ndis_configuration config; + UINT mode; + ndis_rates rates; + ULONG ie_length; + UCHAR ies[1]; }; /* bssid list (OID_802_11_BSSID_LIST) */ struct ndis_bssid_list { - ULONG num_items; - struct ndis_ssid_item items[1]; + ULONG num_items; + struct ndis_ssid_item items[1]; }; @@ -219,100 +219,100 @@ struct ndis_bssid_list { /* task id's */ typedef enum _NDIS_TASK { - TcpIpChecksumNdisTask, - IpSecNdisTask, - TcpLargeSendNdisTask, - MaxNdisTask + TcpIpChecksumNdisTask, + IpSecNdisTask, + TcpLargeSendNdisTask, + MaxNdisTask } NDIS_TASK, *PNDIS_TASK; /* TaskBuffer content on TcpIpChecksumNdisTask */ typedef struct _NDIS_TASK_TCP_IP_CHECKSUM { - struct - { - ULONG IpOptionsSupported:1; - ULONG TcpOptionsSupported:1; - ULONG TcpChecksum:1; - ULONG UdpChecksum:1; - ULONG IpChecksum:1; - } V4Transmit; - - struct - { - ULONG IpOptionsSupported:1; - ULONG TcpOptionsSupported:1; - ULONG TcpChecksum:1; - ULONG UdpChecksum:1; - ULONG IpChecksum:1; - } V4Receive; - - struct - { - ULONG IpOptionsSupported:1; - ULONG TcpOptionsSupported:1; - ULONG TcpChecksum:1; - ULONG UdpChecksum:1; - } V6Transmit; - - struct - { - ULONG IpOptionsSupported:1; - ULONG TcpOptionsSupported:1; - ULONG TcpChecksum:1; - ULONG UdpChecksum:1; - } V6Receive; + struct + { + ULONG IpOptionsSupported:1; + ULONG TcpOptionsSupported:1; + ULONG TcpChecksum:1; + ULONG UdpChecksum:1; + ULONG IpChecksum:1; + } V4Transmit; + + struct + { + ULONG IpOptionsSupported:1; + ULONG TcpOptionsSupported:1; + ULONG TcpChecksum:1; + ULONG UdpChecksum:1; + ULONG IpChecksum:1; + } V4Receive; + + struct + { + ULONG IpOptionsSupported:1; + ULONG TcpOptionsSupported:1; + ULONG TcpChecksum:1; + ULONG UdpChecksum:1; + } V6Transmit; + + struct + { + ULONG IpOptionsSupported:1; + ULONG TcpOptionsSupported:1; + ULONG TcpChecksum:1; + ULONG UdpChecksum:1; + } V6Receive; } NDIS_TASK_TCP_IP_CHECKSUM, *PNDIS_TASK_TCP_IP_CHECKSUM; /* TaskBuffer content on TcpLargeSendNdisTask */ typedef struct _NDIS_TASK_TCP_LARGE_SEND { - ULONG Version; - ULONG MaxOffLoadSize; - ULONG MinSegmentCount; - BOOLEAN TcpOptions; - BOOLEAN IpOptions; + ULONG Version; + ULONG MaxOffLoadSize; + ULONG MinSegmentCount; + BOOLEAN TcpOptions; + BOOLEAN IpOptions; } NDIS_TASK_TCP_LARGE_SEND, *PNDIS_TASK_TCP_LARGE_SEND; /* Encapsulations */ typedef enum _NDIS_ENCAPSULATION { - UNSPECIFIED_Encapsulation, - NULL_Encapsulation, - IEEE_802_3_Encapsulation, - IEEE_802_5_Encapsulation, - LLC_SNAP_ROUTED_Encapsulation, - LLC_SNAP_BRIDGED_Encapsulation + UNSPECIFIED_Encapsulation, + NULL_Encapsulation, + IEEE_802_3_Encapsulation, + IEEE_802_5_Encapsulation, + LLC_SNAP_ROUTED_Encapsulation, + LLC_SNAP_BRIDGED_Encapsulation } NDIS_ENCAPSULATION; /* Encapsulation format */ typedef struct _NDIS_ENCAPSULATION_FORMAT { - NDIS_ENCAPSULATION Encapsulation; - struct { - ULONG FixedHeaderSize : 1; - ULONG Reserved : 31; - } Flags; - ULONG EncapsulationHeaderSize; + NDIS_ENCAPSULATION Encapsulation; + struct { + ULONG FixedHeaderSize : 1; + ULONG Reserved : 31; + } Flags; + ULONG EncapsulationHeaderSize; } NDIS_ENCAPSULATION_FORMAT, *PNDIS_ENCAPSULATION_FORMAT; /* request struct */ typedef struct _NDIS_TASK_OFFLOAD_HEADER { - ULONG Version; - ULONG Size; - ULONG Reserved; - UCHAR OffsetFirstTask; - NDIS_ENCAPSULATION_FORMAT EncapsulationFormat; + ULONG Version; + ULONG Size; + ULONG Reserved; + UCHAR OffsetFirstTask; + NDIS_ENCAPSULATION_FORMAT EncapsulationFormat; } NDIS_TASK_OFFLOAD_HEADER, *PNDIS_TASK_OFFLOAD_HEADER; /* response struct */ #define NDIS_TASK_OFFLOAD_VERSION 1 typedef struct _NDIS_TASK_OFFLOAD { - ULONG Version; - ULONG Size; - NDIS_TASK Task; - ULONG OffsetNextTask; - ULONG TaskBufferLength; - UCHAR TaskBuffer[1]; + ULONG Version; + ULONG Size; + NDIS_TASK Task; + ULONG OffsetNextTask; + ULONG TaskBufferLength; + UCHAR TaskBuffer[1]; } NDIS_TASK_OFFLOAD, *PNDIS_TASK_OFFLOAD; @@ -322,351 +322,353 @@ typedef struct _NDIS_TASK_OFFLOAD /* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ static const value_string win32_802_3_medium_vals[] = { - { NdisMedium802_3, "802.3 (Ethernet)" }, /* might as well be WLAN, ... (see NDIS_PHYSICAL_MEDIUM) */ - { NdisMedium802_5, "802.5 (Token Ring)" }, - { NdisMediumFddi, "FDDI" }, - { NdisMediumWan, "WAN" }, - { NdisMediumLocalTalk, "Local Talk" }, - { NdisMediumDix, "Dix" }, - { NdisMediumArcnetRaw, "Arcnet Raw" }, - { NdisMediumArcnet878_2,"Arcnet 878_2" }, - { NdisMediumAtm, "ATM" }, - { NdisMediumWirelessWan,"Wireless WAN" }, - { NdisMediumIrda, "Irda" }, + { NdisMedium802_3, "802.3 (Ethernet)" }, /* might as well be WLAN,... (see NDIS_PHYSICAL_MEDIUM)*/ + { NdisMedium802_5, "802.5 (Token Ring)" }, + { NdisMediumFddi, "FDDI" }, + { NdisMediumWan, "WAN" }, + { NdisMediumLocalTalk, "Local Talk" }, + { NdisMediumDix, "Dix" }, + { NdisMediumArcnetRaw, "Arcnet Raw" }, + { NdisMediumArcnet878_2, "Arcnet 878_2" }, + { NdisMediumAtm, "ATM" }, + { NdisMediumWirelessWan, "Wireless WAN" }, + { NdisMediumIrda, "Irda" }, { 0, NULL } }; /* NDIS physical driver medium (OID_GEN_PHYSICAL_MEDIUM) */ static const value_string win32_802_3_physical_medium_vals[] = { - { NdisPhysicalMediumUnspecified, "Unspecified" }, - { NdisPhysicalMediumWirelessLan, "Wireless LAN" }, - { NdisPhysicalMediumCableModem, "Cable Modem (DOCSIS)" }, - { NdisPhysicalMediumPhoneLine, "Phone Line" }, - { NdisPhysicalMediumPowerLine, "Power Line" }, - { NdisPhysicalMediumDSL, "DSL" }, - { NdisPhysicalMediumFibreChannel, "Fibre Channel" }, - { NdisPhysicalMedium1394, "IEEE 1394" }, - { NdisPhysicalMediumWirelessWan, "Wireless WAN" }, + { NdisPhysicalMediumUnspecified, "Unspecified" }, + { NdisPhysicalMediumWirelessLan, "Wireless LAN" }, + { NdisPhysicalMediumCableModem, "Cable Modem (DOCSIS)" }, + { NdisPhysicalMediumPhoneLine, "Phone Line" }, + { NdisPhysicalMediumPowerLine, "Power Line" }, + { NdisPhysicalMediumDSL, "DSL" }, + { NdisPhysicalMediumFibreChannel, "Fibre Channel" }, + { NdisPhysicalMedium1394, "IEEE 1394" }, + { NdisPhysicalMediumWirelessWan, "Wireless WAN" }, { 0, NULL } }; static const value_string win32_802_11_infra_mode_vals[] = { - { Ndis802_11IBSS, "Ad Hoc" }, - { Ndis802_11Infrastructure, "Access Point" }, - { Ndis802_11AutoUnknown, "Auto or unknown" }, + { Ndis802_11IBSS, "Ad Hoc" }, + { Ndis802_11Infrastructure, "Access Point" }, + { Ndis802_11AutoUnknown, "Auto or unknown" }, { 0, NULL } }; static const value_string win32_802_11_auth_mode_vals[] = { - { Ndis802_11AuthModeOpen, "Open System" }, - { Ndis802_11AuthModeShared, "Shared Key" }, - { Ndis802_11AuthModeAutoSwitch, "Auto Switch" }, - { Ndis802_11AuthModeWPA, "WPA" }, - { Ndis802_11AuthModeWPAPSK, "WPA-PSK (pre shared key)" }, - { Ndis802_11AuthModeWPANone, "WPA (ad hoc)" }, + { Ndis802_11AuthModeOpen, "Open System" }, + { Ndis802_11AuthModeShared, "Shared Key" }, + { Ndis802_11AuthModeAutoSwitch, "Auto Switch" }, + { Ndis802_11AuthModeWPA, "WPA" }, + { Ndis802_11AuthModeWPAPSK, "WPA-PSK (pre shared key)" }, + { Ndis802_11AuthModeWPANone, "WPA (ad hoc)" }, #if (_MSC_VER != 1400) /* These are not defined in Ntddndis.h in MSVC2005/MSVC2005EE PSDK */ - { Ndis802_11AuthModeWPA2, "WPA2" }, - { Ndis802_11AuthModeWPA2PSK, "WPA2-PSK (pre shared key)" }, + { Ndis802_11AuthModeWPA2, "WPA2" }, + { Ndis802_11AuthModeWPA2PSK, "WPA2-PSK (pre shared key)" }, #endif { 0, NULL } }; static const value_string win32_802_11_network_type_vals[] = { - { Ndis802_11FH, "FH (frequency-hopping spread-spectrum)" }, - { Ndis802_11DS, "DS (direct-sequence spread-spectrum)" }, - { Ndis802_11OFDM5, "5-GHz OFDM" }, - { Ndis802_11OFDM24, "2.4-GHz OFDM" }, + { Ndis802_11FH, "FH (frequency-hopping spread-spectrum)" }, + { Ndis802_11DS, "DS (direct-sequence spread-spectrum)" }, + { Ndis802_11OFDM5, "5-GHz OFDM" }, + { Ndis802_11OFDM24, "2.4-GHz OFDM" }, #if (_MSC_VER != 1400) /* These are not defined in Ntddndis.h in MSVC2005/MSVC2005EE PSDK */ - { Ndis802_11Automode, "Auto" }, + { Ndis802_11Automode, "Auto" }, #endif { 0, NULL } }; static const value_string win32_802_11_encryption_status_vals[] = { - { Ndis802_11Encryption1Enabled, "WEP enabled, TKIP & AES disabled, transmit key available" }, - { Ndis802_11EncryptionDisabled, "WEP & TKIP & AES disabled, transmit key available" }, - { Ndis802_11Encryption1KeyAbsent, "WEP enabled, TKIP & AES disabled, transmit key unavailable" }, - { Ndis802_11EncryptionNotSupported, "WEP & TKIP & AES not supported" }, - { Ndis802_11Encryption2Enabled, "WEP & TKIP enabled, AES disabled, transmit key available" }, - { Ndis802_11Encryption2KeyAbsent, "WEP & TKIP enabled, AES disabled, transmit key unavailable" }, - { Ndis802_11Encryption3Enabled, "WEP & TKIP & AES enabled, transmit key available" }, - { Ndis802_11Encryption3KeyAbsent, "WEP & TKIP & AES enabled, transmit key unavailable" }, + { Ndis802_11Encryption1Enabled, "WEP enabled, TKIP & AES disabled, transmit key available" }, + { Ndis802_11EncryptionDisabled, "WEP & TKIP & AES disabled, transmit key available" }, + { Ndis802_11Encryption1KeyAbsent, "WEP enabled, TKIP & AES disabled, transmit key unavailable" }, + { Ndis802_11EncryptionNotSupported, "WEP & TKIP & AES not supported" }, + { Ndis802_11Encryption2Enabled, "WEP & TKIP enabled, AES disabled, transmit key available" }, + { Ndis802_11Encryption2KeyAbsent, "WEP & TKIP enabled, AES disabled, transmit key unavailable" }, + { Ndis802_11Encryption3Enabled, "WEP & TKIP & AES enabled, transmit key available" }, + { Ndis802_11Encryption3KeyAbsent, "WEP & TKIP & AES enabled, transmit key unavailable" }, { 0, NULL } }; /* frequency to channel mapping (OID_802_11_CONFIGURATION) */ static const value_string win32_802_11_channel_freq_vals[] = { - { 2412000, "1 (2412 MHz)" }, - { 2417000, "2 (2417 MHz)" }, - { 2422000, "3 (2422 MHz)" }, - { 2427000, "4 (2427 MHz)" }, - { 2432000, "5 (2432 MHz)" }, - { 2437000, "6 (2437 MHz)" }, - { 2442000, "7 (2442 MHz)" }, - { 2447000, "8 (2447 MHz)" }, - { 2452000, "9 (2452 MHz)" }, - { 2457000, "10 (2457 MHz)" }, - { 2462000, "11 (2462 MHz)" }, - { 2467000, "12 (2467 MHz)" }, - { 2472000, "13 (2472 MHz)" }, - { 2484000, "14 (2484 MHz)" }, + { 2412000, "1 (2412 MHz)" }, + { 2417000, "2 (2417 MHz)" }, + { 2422000, "3 (2422 MHz)" }, + { 2427000, "4 (2427 MHz)" }, + { 2432000, "5 (2432 MHz)" }, + { 2437000, "6 (2437 MHz)" }, + { 2442000, "7 (2442 MHz)" }, + { 2447000, "8 (2447 MHz)" }, + { 2452000, "9 (2452 MHz)" }, + { 2457000, "10 (2457 MHz)" }, + { 2462000, "11 (2462 MHz)" }, + { 2467000, "12 (2467 MHz)" }, + { 2472000, "13 (2472 MHz)" }, + { 2484000, "14 (2484 MHz)" }, { 0, NULL } }; /* frequency to channel mapping (OID_802_11_CONFIGURATION) */ static const value_string win32_802_11_channel_vals[] = { - { 2412000, "1" }, - { 2417000, "2" }, - { 2422000, "3" }, - { 2427000, "4" }, - { 2432000, "5" }, - { 2437000, "6" }, - { 2442000, "7" }, - { 2447000, "8" }, - { 2452000, "9" }, - { 2457000, "10" }, - { 2462000, "11" }, - { 2467000, "12" }, - { 2472000, "13" }, - { 2484000, "14" }, + { 2412000, "1" }, + { 2417000, "2" }, + { 2422000, "3" }, + { 2427000, "4" }, + { 2432000, "5" }, + { 2437000, "6" }, + { 2442000, "7" }, + { 2447000, "8" }, + { 2452000, "9" }, + { 2457000, "10" }, + { 2462000, "11" }, + { 2467000, "12" }, + { 2472000, "13" }, + { 2484000, "14" }, { 0, NULL } }; /* Information Element IDs (802.11 Spec: "7.3.2 Information elements") */ -#define IE_ID_SSID 0 -#define IE_ID_SUPPORTED_RATES 1 -#define IE_ID_DS_PARAMETER_SET 3 -#define IE_ID_TIM 5 -#define IE_ID_COUNTRY 7 -#define IE_ID_ERP_INFORMATION 42 -#define IE_ID_WPA2 48 -#define IE_ID_EXTENDED_SUPPORT_RATES 50 -#define IE_ID_VENDOR_SPECIFIC 221 +#define IE_ID_SSID 0 +#define IE_ID_SUPPORTED_RATES 1 +#define IE_ID_DS_PARAMETER_SET 3 +#define IE_ID_TIM 5 +#define IE_ID_COUNTRY 7 +#define IE_ID_ERP_INFORMATION 42 +#define IE_ID_WPA2 48 +#define IE_ID_EXTENDED_SUPPORT_RATES 50 +#define IE_ID_VENDOR_SPECIFIC 221 +#ifdef DEBUG_IE /* ElementID in NDIS_802_11_VARIABLE_IEs */ static const value_string ie_id_vals[] = { - { IE_ID_SSID, "SSID, 802.11" }, - { IE_ID_SUPPORTED_RATES, "Supported Rates, 802.11" }, - { 2, "FH Parameter Set, 802.11" }, - { IE_ID_DS_PARAMETER_SET, "DS Parameter Set, 802.11" }, - { 4, "CF Parameter Set, 802.11" }, - { IE_ID_TIM, "TIM, 802.11" }, - { 6, "IBSS Parameter Set, 802.11" }, - { IE_ID_COUNTRY, "Country, 802.11d" }, - { 8, "Hopping Pattern Parameters, 802.11d" }, - { 9, "Hopping Pattern Table, 802.11d" }, - { 10, "Request, 802.11d" }, - /* 11-15 reserved, 802.11d */ - { 16, "Challenge text, 802.11" }, - /* 17-31 reserved, 802.11h */ - { 32, "Power Constraint, 802.11h" }, - { 33, "Power Capability, 802.11h" }, - { 34, "TPC Request, 802.11h" }, - { 35, "TPC Report, 802.11h" }, - { 36, "Supported Channels, 802.11h" }, - { 37, "Channel Switch Announcement, 802.11h" }, - { 38, "Measurement Request, 802.11h" }, - { 39, "Measurement Report, 802.11h" }, - { 40, "Quiet, 802.11h" }, - { 41, "IBSS DFS, 802.11h" }, - { IE_ID_ERP_INFORMATION, "ERP information, 802.11g" }, - /* 43-47 reserved, 802.11i */ - { IE_ID_WPA2, "WPA2/RSN (Robust Secure Network), 802.11i" }, - /* 49 reserved, 802.11i */ - { IE_ID_EXTENDED_SUPPORT_RATES, "Extended Supported Rates, 802.11g" }, - /* 51-255 reserved, 802.11g */ - { IE_ID_VENDOR_SPECIFIC, "WPA, (not 802.11!)" }, - { 0, NULL } + { IE_ID_SSID, "SSID, 802.11" }, + { IE_ID_SUPPORTED_RATES, "Supported Rates, 802.11" }, + { 2, "FH Parameter Set, 802.11" }, + { IE_ID_DS_PARAMETER_SET, "DS Parameter Set, 802.11" }, + { 4, "CF Parameter Set, 802.11" }, + { IE_ID_TIM, "TIM, 802.11" }, + { 6, "IBSS Parameter Set, 802.11" }, + { IE_ID_COUNTRY, "Country, 802.11d" }, + { 8, "Hopping Pattern Parameters, 802.11d" }, + { 9, "Hopping Pattern Table, 802.11d" }, + { 10, "Request, 802.11d" }, + /* 11-15 reserved, 802.11d */ + { 16, "Challenge text, 802.11" }, + /* 17-31 reserved, 802.11h */ + { 32, "Power Constraint, 802.11h" }, + { 33, "Power Capability, 802.11h" }, + { 34, "TPC Request, 802.11h" }, + { 35, "TPC Report, 802.11h" }, + { 36, "Supported Channels, 802.11h" }, + { 37, "Channel Switch Announcement, 802.11h" }, + { 38, "Measurement Request, 802.11h" }, + { 39, "Measurement Report, 802.11h" }, + { 40, "Quiet, 802.11h" }, + { 41, "IBSS DFS, 802.11h" }, + { IE_ID_ERP_INFORMATION, "ERP information, 802.11g" }, + /* 43-47 reserved, 802.11i */ + { IE_ID_WPA2, "WPA2/RSN (Robust Secure Network), 802.11i" }, + /* 49 reserved, 802.11i */ + { IE_ID_EXTENDED_SUPPORT_RATES, "Extended Supported Rates, 802.11g" }, + /* 51-255 reserved, 802.11g */ + { IE_ID_VENDOR_SPECIFIC, "WPA, (not 802.11!)" }, + { 0, NULL } }; +#endif - +#if 0 static const value_string oid_vals[] = { - { OID_GEN_SUPPORTED_LIST, "OID_GEN_SUPPORTED_LIST" }, - { OID_GEN_HARDWARE_STATUS, "OID_GEN_HARDWARE_STATUS (only internally interesting)" }, - { OID_GEN_MEDIA_SUPPORTED, "OID_GEN_MEDIA_SUPPORTED" }, - { OID_GEN_MEDIA_IN_USE, "OID_GEN_MEDIA_IN_USE" }, - { OID_GEN_MAXIMUM_LOOKAHEAD, "OID_GEN_MAXIMUM_LOOKAHEAD (unused)" }, - { OID_GEN_MAXIMUM_FRAME_SIZE, "OID_GEN_MAXIMUM_FRAME_SIZE (unused)" }, - { OID_GEN_LINK_SPEED, "OID_GEN_LINK_SPEED" }, - { OID_GEN_TRANSMIT_BUFFER_SPACE, "OID_GEN_TRANSMIT_BUFFER_SPACE" }, - { OID_GEN_RECEIVE_BUFFER_SPACE, "OID_GEN_RECEIVE_BUFFER_SPACE" }, - { OID_GEN_TRANSMIT_BLOCK_SIZE, "OID_GEN_TRANSMIT_BLOCK_SIZE" }, - { OID_GEN_RECEIVE_BLOCK_SIZE, "OID_GEN_RECEIVE_BLOCK_SIZE" }, - { OID_GEN_VENDOR_ID, "OID_GEN_VENDOR_ID" }, - { OID_GEN_VENDOR_DESCRIPTION, "OID_GEN_VENDOR_DESCRIPTION" }, - { OID_GEN_CURRENT_PACKET_FILTER, "OID_GEN_CURRENT_PACKET_FILTER (info seems to be constant)" }, - { OID_GEN_CURRENT_LOOKAHEAD, "OID_GEN_CURRENT_LOOKAHEAD (only internally interesting)" }, - { OID_GEN_DRIVER_VERSION, "OID_GEN_DRIVER_VERSION" }, - { OID_GEN_MAXIMUM_TOTAL_SIZE, "OID_GEN_MAXIMUM_TOTAL_SIZE" }, - { OID_GEN_PROTOCOL_OPTIONS, "OID_GEN_PROTOCOL_OPTIONS (info not interesting)" }, - { OID_GEN_MAC_OPTIONS, "OID_GEN_MAC_OPTIONS" }, - { OID_GEN_MEDIA_CONNECT_STATUS, "OID_GEN_MEDIA_CONNECT_STATUS" }, - { OID_GEN_MAXIMUM_SEND_PACKETS, "OID_GEN_MAXIMUM_SEND_PACKETS (only internally interesting)" }, - { OID_GEN_VENDOR_DRIVER_VERSION, "OID_GEN_VENDOR_DRIVER_VERSION" }, - { OID_GEN_XMIT_OK, "OID_GEN_XMIT_OK" }, - { OID_GEN_RCV_OK, "OID_GEN_RCV_OK" }, - { OID_GEN_XMIT_ERROR, "OID_GEN_XMIT_ERROR" }, - { OID_GEN_RCV_ERROR, "OID_GEN_RCV_ERROR" }, - { OID_GEN_RCV_NO_BUFFER, "OID_GEN_RCV_NO_BUFFER" }, - { OID_GEN_DIRECTED_BYTES_XMIT, "OID_GEN_DIRECTED_BYTES_XMIT" }, - { OID_GEN_DIRECTED_FRAMES_XMIT, "OID_GEN_DIRECTED_FRAMES_XMIT" }, - { OID_GEN_MULTICAST_BYTES_XMIT, "OID_GEN_MULTICAST_BYTES_XMIT" }, - { OID_GEN_MULTICAST_FRAMES_XMIT, "OID_GEN_MULTICAST_FRAMES_XMIT" }, - { OID_GEN_BROADCAST_BYTES_XMIT, "OID_GEN_BROADCAST_BYTES_XMIT" }, - { OID_GEN_BROADCAST_FRAMES_XMIT, "OID_GEN_BROADCAST_FRAMES_XMIT" }, - { OID_GEN_DIRECTED_BYTES_RCV, "OID_GEN_DIRECTED_BYTES_RCV" }, - { OID_GEN_DIRECTED_FRAMES_RCV, "OID_GEN_DIRECTED_FRAMES_RCV" }, - { OID_GEN_MULTICAST_BYTES_RCV, "OID_GEN_MULTICAST_BYTES_RCV" }, - { OID_GEN_MULTICAST_FRAMES_RCV, "OID_GEN_MULTICAST_FRAMES_RCV" }, - { OID_GEN_BROADCAST_BYTES_RCV, "OID_GEN_BROADCAST_BYTES_RCV" }, - { OID_GEN_BROADCAST_FRAMES_RCV, "OID_GEN_BROADCAST_FRAMES_RCV" }, - { OID_GEN_RCV_CRC_ERROR, "OID_GEN_RCV_CRC_ERROR" }, - { OID_GEN_TRANSMIT_QUEUE_LENGTH, "OID_GEN_TRANSMIT_QUEUE_LENGTH" }, - { OID_GEN_GET_TIME_CAPS, "OID_GEN_GET_TIME_CAPS (unsupp, unused)" }, - { OID_GEN_GET_NETCARD_TIME, "OID_GEN_GET_NETCARD_TIME (unsupp, unused)" }, - - { OID_GEN_PHYSICAL_MEDIUM, "OID_GEN_PHYSICAL_MEDIUM" }, - /*{ OID_GEN_MACHINE_NAME, "OID_GEN_MACHINE_NAME (unsupp, unused)" },*/ - { OID_GEN_VLAN_ID, "OID_GEN_VLAN_ID" }, - { OID_GEN_MEDIA_CAPABILITIES, "OID_GEN_MEDIA_CAPABILITIES (unsupp, unused)" }, - - { OID_GEN_NETWORK_LAYER_ADDRESSES, "OID_GEN_NETWORK_LAYER_ADDRESSES (write only)" }, - { OID_GEN_TRANSPORT_HEADER_OFFSET, "OID_GEN_TRANSPORT_HEADER_OFFSET (write only)" }, - - { OID_802_3_PERMANENT_ADDRESS, "OID_802_3_PERMANENT_ADDRESS" }, - { OID_802_3_CURRENT_ADDRESS, "OID_802_3_CURRENT_ADDRESS" }, - { OID_802_3_MAXIMUM_LIST_SIZE, "OID_802_3_MAXIMUM_LIST_SIZE (unused)" }, - { OID_802_3_MULTICAST_LIST, "OID_802_3_MULTICAST_LIST (unused)" }, /* XXX */ - { OID_802_3_MAC_OPTIONS, "OID_802_3_MAC_OPTIONS (unsupp, unused)" }, - - { OID_802_3_RCV_ERROR_ALIGNMENT, "OID_802_3_RCV_ERROR_ALIGNMENT" }, - { OID_802_3_XMIT_ONE_COLLISION, "OID_802_3_XMIT_ONE_COLLISION" }, - { OID_802_3_XMIT_MORE_COLLISIONS, "OID_802_3_XMIT_MORE_COLLISIONS" }, - { OID_802_3_XMIT_DEFERRED, "OID_802_3_XMIT_DEFERRED" }, - { OID_802_3_XMIT_MAX_COLLISIONS, "OID_802_3_XMIT_MAX_COLLISIONS" }, - { OID_802_3_RCV_OVERRUN, "OID_802_3_RCV_OVERRUN" }, - { OID_802_3_XMIT_UNDERRUN, "OID_802_3_XMIT_UNDERRUN" }, - { OID_802_3_XMIT_HEARTBEAT_FAILURE, "OID_802_3_XMIT_HEARTBEAT_FAILURE (unsupp, used)" }, - { OID_802_3_XMIT_TIMES_CRS_LOST, "OID_802_3_XMIT_TIMES_CRS_LOST (unsupp, used)" }, - { OID_802_3_XMIT_LATE_COLLISIONS, "OID_802_3_XMIT_LATE_COLLISIONS" }, - - { OID_802_11_BSSID, "OID_802_11_BSSID" }, - { OID_802_11_SSID, "OID_802_11_SSID" }, - { OID_802_11_NETWORK_TYPES_SUPPORTED, "OID_802_11_NETWORK_TYPES_SUPPORTED (info not interesting)" }, - { OID_802_11_NETWORK_TYPE_IN_USE, "OID_802_11_NETWORK_TYPE_IN_USE" }, - { OID_802_11_TX_POWER_LEVEL, "OID_802_11_TX_POWER_LEVEL (unsupp, used)" }, - { OID_802_11_RSSI, "OID_802_11_RSSI" }, - { OID_802_11_RSSI_TRIGGER, "OID_802_11_RSSI_TRIGGER (unsupp, unused)" }, - { OID_802_11_INFRASTRUCTURE_MODE, "OID_802_11_INFRASTRUCTURE_MODE" }, - { OID_802_11_FRAGMENTATION_THRESHOLD, "OID_802_11_FRAGMENTATION_THRESHOLD (unused)" }, - { OID_802_11_RTS_THRESHOLD, "OID_802_11_RTS_THRESHOLD (unused)" }, - { OID_802_11_NUMBER_OF_ANTENNAS, "OID_802_11_NUMBER_OF_ANTENNAS (unsupp, unused)" }, - { OID_802_11_RX_ANTENNA_SELECTED, "OID_802_11_RX_ANTENNA_SELECTED (unsupp, unused)" }, - { OID_802_11_TX_ANTENNA_SELECTED, "OID_802_11_TX_ANTENNA_SELECTED (unsupp, unused)" }, - { OID_802_11_SUPPORTED_RATES, "OID_802_11_SUPPORTED_RATES" }, - { OID_802_11_DESIRED_RATES, "OID_802_11_DESIRED_RATES (unsupp, used)" }, - { OID_802_11_CONFIGURATION, "OID_802_11_CONFIGURATION" }, - { OID_802_11_STATISTICS, "OID_802_11_STATISTICS (unsupp, unused)" }, - { OID_802_11_ADD_WEP, "OID_802_11_ADD_WEP (write only)" }, - { OID_802_11_REMOVE_WEP, "OID_802_11_REMOVE_WEP (write only)" }, - { OID_802_11_DISASSOCIATE, "OID_802_11_DISASSOCIATE (write only)" }, - { OID_802_11_POWER_MODE, "OID_802_11_POWER_MODE (info not interesting)" }, - { OID_802_11_BSSID_LIST, "OID_802_11_BSSID_LIST" }, - { OID_802_11_AUTHENTICATION_MODE, "OID_802_11_AUTHENTICATION_MODE" }, - { OID_802_11_PRIVACY_FILTER, "OID_802_11_PRIVACY_FILTER (info not interesting)" }, - { OID_802_11_BSSID_LIST_SCAN, "OID_802_11_BSSID_LIST_SCAN" }, - { OID_802_11_WEP_STATUS, "OID_802_11_WEP_STATUS (info not interesting?)" }, - { OID_802_11_ENCRYPTION_STATUS, "OID_802_11_ENCRYPTION_STATUS (unsupp, used)" }, - { OID_802_11_RELOAD_DEFAULTS, "OID_802_11_RELOAD_DEFAULTS (write only)" }, - { OID_802_11_ADD_KEY, "OID_802_11_ADD_KEY (write only)" }, - { OID_802_11_REMOVE_KEY, "OID_802_11_REMOVE_KEY (write only)" }, - { OID_802_11_ASSOCIATION_INFORMATION, "OID_802_11_ASSOCIATION_INFORMATION (unused)" }, /* XXX */ - { OID_802_11_TEST, "OID_802_11_TEST (write only)" }, + { OID_GEN_SUPPORTED_LIST, "OID_GEN_SUPPORTED_LIST" }, + { OID_GEN_HARDWARE_STATUS, "OID_GEN_HARDWARE_STATUS (only internally interesting)" }, + { OID_GEN_MEDIA_SUPPORTED, "OID_GEN_MEDIA_SUPPORTED" }, + { OID_GEN_MEDIA_IN_USE, "OID_GEN_MEDIA_IN_USE" }, + { OID_GEN_MAXIMUM_LOOKAHEAD, "OID_GEN_MAXIMUM_LOOKAHEAD (unused)" }, + { OID_GEN_MAXIMUM_FRAME_SIZE, "OID_GEN_MAXIMUM_FRAME_SIZE (unused)" }, + { OID_GEN_LINK_SPEED, "OID_GEN_LINK_SPEED" }, + { OID_GEN_TRANSMIT_BUFFER_SPACE, "OID_GEN_TRANSMIT_BUFFER_SPACE" }, + { OID_GEN_RECEIVE_BUFFER_SPACE, "OID_GEN_RECEIVE_BUFFER_SPACE" }, + { OID_GEN_TRANSMIT_BLOCK_SIZE, "OID_GEN_TRANSMIT_BLOCK_SIZE" }, + { OID_GEN_RECEIVE_BLOCK_SIZE, "OID_GEN_RECEIVE_BLOCK_SIZE" }, + { OID_GEN_VENDOR_ID, "OID_GEN_VENDOR_ID" }, + { OID_GEN_VENDOR_DESCRIPTION, "OID_GEN_VENDOR_DESCRIPTION" }, + { OID_GEN_CURRENT_PACKET_FILTER, "OID_GEN_CURRENT_PACKET_FILTER (info seems to be constant)" }, + { OID_GEN_CURRENT_LOOKAHEAD, "OID_GEN_CURRENT_LOOKAHEAD (only internally interesting)" }, + { OID_GEN_DRIVER_VERSION, "OID_GEN_DRIVER_VERSION" }, + { OID_GEN_MAXIMUM_TOTAL_SIZE, "OID_GEN_MAXIMUM_TOTAL_SIZE" }, + { OID_GEN_PROTOCOL_OPTIONS, "OID_GEN_PROTOCOL_OPTIONS (info not interesting)" }, + { OID_GEN_MAC_OPTIONS, "OID_GEN_MAC_OPTIONS" }, + { OID_GEN_MEDIA_CONNECT_STATUS, "OID_GEN_MEDIA_CONNECT_STATUS" }, + { OID_GEN_MAXIMUM_SEND_PACKETS, "OID_GEN_MAXIMUM_SEND_PACKETS (only internally interesting)" }, + { OID_GEN_VENDOR_DRIVER_VERSION, "OID_GEN_VENDOR_DRIVER_VERSION" }, + { OID_GEN_XMIT_OK, "OID_GEN_XMIT_OK" }, + { OID_GEN_RCV_OK, "OID_GEN_RCV_OK" }, + { OID_GEN_XMIT_ERROR, "OID_GEN_XMIT_ERROR" }, + { OID_GEN_RCV_ERROR, "OID_GEN_RCV_ERROR" }, + { OID_GEN_RCV_NO_BUFFER, "OID_GEN_RCV_NO_BUFFER" }, + { OID_GEN_DIRECTED_BYTES_XMIT, "OID_GEN_DIRECTED_BYTES_XMIT" }, + { OID_GEN_DIRECTED_FRAMES_XMIT, "OID_GEN_DIRECTED_FRAMES_XMIT" }, + { OID_GEN_MULTICAST_BYTES_XMIT, "OID_GEN_MULTICAST_BYTES_XMIT" }, + { OID_GEN_MULTICAST_FRAMES_XMIT, "OID_GEN_MULTICAST_FRAMES_XMIT" }, + { OID_GEN_BROADCAST_BYTES_XMIT, "OID_GEN_BROADCAST_BYTES_XMIT" }, + { OID_GEN_BROADCAST_FRAMES_XMIT, "OID_GEN_BROADCAST_FRAMES_XMIT" }, + { OID_GEN_DIRECTED_BYTES_RCV, "OID_GEN_DIRECTED_BYTES_RCV" }, + { OID_GEN_DIRECTED_FRAMES_RCV, "OID_GEN_DIRECTED_FRAMES_RCV" }, + { OID_GEN_MULTICAST_BYTES_RCV, "OID_GEN_MULTICAST_BYTES_RCV" }, + { OID_GEN_MULTICAST_FRAMES_RCV, "OID_GEN_MULTICAST_FRAMES_RCV" }, + { OID_GEN_BROADCAST_BYTES_RCV, "OID_GEN_BROADCAST_BYTES_RCV" }, + { OID_GEN_BROADCAST_FRAMES_RCV, "OID_GEN_BROADCAST_FRAMES_RCV" }, + { OID_GEN_RCV_CRC_ERROR, "OID_GEN_RCV_CRC_ERROR" }, + { OID_GEN_TRANSMIT_QUEUE_LENGTH, "OID_GEN_TRANSMIT_QUEUE_LENGTH" }, + { OID_GEN_GET_TIME_CAPS, "OID_GEN_GET_TIME_CAPS (unsupp, unused)" }, + { OID_GEN_GET_NETCARD_TIME, "OID_GEN_GET_NETCARD_TIME (unsupp, unused)" }, + + { OID_GEN_PHYSICAL_MEDIUM, "OID_GEN_PHYSICAL_MEDIUM" }, + /*{ OID_GEN_MACHINE_NAME, "OID_GEN_MACHINE_NAME (unsupp, unused)" },*/ + { OID_GEN_VLAN_ID, "OID_GEN_VLAN_ID" }, + { OID_GEN_MEDIA_CAPABILITIES, "OID_GEN_MEDIA_CAPABILITIES (unsupp, unused)" }, + + { OID_GEN_NETWORK_LAYER_ADDRESSES, "OID_GEN_NETWORK_LAYER_ADDRESSES (write only)" }, + { OID_GEN_TRANSPORT_HEADER_OFFSET, "OID_GEN_TRANSPORT_HEADER_OFFSET (write only)" }, + + { OID_802_3_PERMANENT_ADDRESS, "OID_802_3_PERMANENT_ADDRESS" }, + { OID_802_3_CURRENT_ADDRESS, "OID_802_3_CURRENT_ADDRESS" }, + { OID_802_3_MAXIMUM_LIST_SIZE, "OID_802_3_MAXIMUM_LIST_SIZE (unused)" }, + { OID_802_3_MULTICAST_LIST, "OID_802_3_MULTICAST_LIST (unused)" }, /* XXX */ + { OID_802_3_MAC_OPTIONS, "OID_802_3_MAC_OPTIONS (unsupp, unused)" }, + + { OID_802_3_RCV_ERROR_ALIGNMENT, "OID_802_3_RCV_ERROR_ALIGNMENT" }, + { OID_802_3_XMIT_ONE_COLLISION, "OID_802_3_XMIT_ONE_COLLISION" }, + { OID_802_3_XMIT_MORE_COLLISIONS, "OID_802_3_XMIT_MORE_COLLISIONS" }, + { OID_802_3_XMIT_DEFERRED, "OID_802_3_XMIT_DEFERRED" }, + { OID_802_3_XMIT_MAX_COLLISIONS, "OID_802_3_XMIT_MAX_COLLISIONS" }, + { OID_802_3_RCV_OVERRUN, "OID_802_3_RCV_OVERRUN" }, + { OID_802_3_XMIT_UNDERRUN, "OID_802_3_XMIT_UNDERRUN" }, + { OID_802_3_XMIT_HEARTBEAT_FAILURE, "OID_802_3_XMIT_HEARTBEAT_FAILURE (unsupp, used)" }, + { OID_802_3_XMIT_TIMES_CRS_LOST, "OID_802_3_XMIT_TIMES_CRS_LOST (unsupp, used)" }, + { OID_802_3_XMIT_LATE_COLLISIONS, "OID_802_3_XMIT_LATE_COLLISIONS" }, + + { OID_802_11_BSSID, "OID_802_11_BSSID" }, + { OID_802_11_SSID, "OID_802_11_SSID" }, + { OID_802_11_NETWORK_TYPES_SUPPORTED, "OID_802_11_NETWORK_TYPES_SUPPORTED (info not interesting)" }, + { OID_802_11_NETWORK_TYPE_IN_USE, "OID_802_11_NETWORK_TYPE_IN_USE" }, + { OID_802_11_TX_POWER_LEVEL, "OID_802_11_TX_POWER_LEVEL (unsupp, used)" }, + { OID_802_11_RSSI, "OID_802_11_RSSI" }, + { OID_802_11_RSSI_TRIGGER, "OID_802_11_RSSI_TRIGGER (unsupp, unused)" }, + { OID_802_11_INFRASTRUCTURE_MODE, "OID_802_11_INFRASTRUCTURE_MODE" }, + { OID_802_11_FRAGMENTATION_THRESHOLD, "OID_802_11_FRAGMENTATION_THRESHOLD (unused)" }, + { OID_802_11_RTS_THRESHOLD, "OID_802_11_RTS_THRESHOLD (unused)" }, + { OID_802_11_NUMBER_OF_ANTENNAS, "OID_802_11_NUMBER_OF_ANTENNAS (unsupp, unused)" }, + { OID_802_11_RX_ANTENNA_SELECTED, "OID_802_11_RX_ANTENNA_SELECTED (unsupp, unused)" }, + { OID_802_11_TX_ANTENNA_SELECTED, "OID_802_11_TX_ANTENNA_SELECTED (unsupp, unused)" }, + { OID_802_11_SUPPORTED_RATES, "OID_802_11_SUPPORTED_RATES" }, + { OID_802_11_DESIRED_RATES, "OID_802_11_DESIRED_RATES (unsupp, used)" }, + { OID_802_11_CONFIGURATION, "OID_802_11_CONFIGURATION" }, + { OID_802_11_STATISTICS, "OID_802_11_STATISTICS (unsupp, unused)" }, + { OID_802_11_ADD_WEP, "OID_802_11_ADD_WEP (write only)" }, + { OID_802_11_REMOVE_WEP, "OID_802_11_REMOVE_WEP (write only)" }, + { OID_802_11_DISASSOCIATE, "OID_802_11_DISASSOCIATE (write only)" }, + { OID_802_11_POWER_MODE, "OID_802_11_POWER_MODE (info not interesting)" }, + { OID_802_11_BSSID_LIST, "OID_802_11_BSSID_LIST" }, + { OID_802_11_AUTHENTICATION_MODE, "OID_802_11_AUTHENTICATION_MODE" }, + { OID_802_11_PRIVACY_FILTER, "OID_802_11_PRIVACY_FILTER (info not interesting)" }, + { OID_802_11_BSSID_LIST_SCAN, "OID_802_11_BSSID_LIST_SCAN" }, + { OID_802_11_WEP_STATUS, "OID_802_11_WEP_STATUS (info not interesting?)" }, + { OID_802_11_ENCRYPTION_STATUS, "OID_802_11_ENCRYPTION_STATUS (unsupp, used)" }, + { OID_802_11_RELOAD_DEFAULTS, "OID_802_11_RELOAD_DEFAULTS (write only)" }, + { OID_802_11_ADD_KEY, "OID_802_11_ADD_KEY (write only)" }, + { OID_802_11_REMOVE_KEY, "OID_802_11_REMOVE_KEY (write only)" }, + { OID_802_11_ASSOCIATION_INFORMATION, "OID_802_11_ASSOCIATION_INFORMATION (unused)" }, /* XXX */ + { OID_802_11_TEST, "OID_802_11_TEST (write only)" }, #if (_MSC_VER != 1400) /* These are not defined in Ntddndis.h in MSVC2005/MSVC2005EE PSDK */ - { OID_802_11_CAPABILITY, "OID_802_11_CAPABILITY (unsupp, unused)" }, - { OID_802_11_PMKID, "OID_802_11_PMKID (unsupp, unused)" }, + { OID_802_11_CAPABILITY, "OID_802_11_CAPABILITY (unsupp, unused)" }, + { OID_802_11_PMKID, "OID_802_11_PMKID (unsupp, unused)" }, #endif - /* Token-Ring list is utterly incomplete (contains only the values for MS Loopback Driver) */ - { OID_802_5_PERMANENT_ADDRESS, "OID_802_5_PERMANENT_ADDRESS (unused)" }, - { OID_802_5_CURRENT_ADDRESS, "OID_802_5_CURRENT_ADDRESS (unused)" }, - { OID_802_5_CURRENT_FUNCTIONAL, "OID_802_5_CURRENT_FUNCTIONAL (unused)" }, - { OID_802_5_CURRENT_GROUP, "OID_802_5_CURRENT_GROUP (unused)" }, - { OID_802_5_LAST_OPEN_STATUS, "OID_802_5_LAST_OPEN_STATUS (unused)" }, - { OID_802_5_CURRENT_RING_STATUS, "OID_802_5_CURRENT_RING_STATUS (unused)" }, - { OID_802_5_CURRENT_RING_STATE, "OID_802_5_CURRENT_RING_STATE (unused)" }, - { OID_802_5_LINE_ERRORS, "OID_802_5_LINE_ERRORS (unused)" }, - { OID_802_5_LOST_FRAMES, "OID_802_5_LOST_FRAMES (unused)" }, - - /* FDDI list is utterly incomplete (contains only the values for MS Loopback Driver) */ - { OID_FDDI_LONG_PERMANENT_ADDR, "OID_FDDI_LONG_PERMANENT_ADDR (unused)" }, - { OID_FDDI_LONG_CURRENT_ADDR, "OID_FDDI_LONG_CURRENT_ADDR (unused)" }, - { OID_FDDI_LONG_MULTICAST_LIST, "OID_FDDI_LONG_MULTICAST_LIST (unused)" }, - { OID_FDDI_LONG_MAX_LIST_SIZE, "OID_FDDI_LONG_MAX_LIST_SIZE (unused)" }, - { OID_FDDI_SHORT_PERMANENT_ADDR, "OID_FDDI_SHORT_PERMANENT_ADDR (unused)" }, - { OID_FDDI_SHORT_CURRENT_ADDR, "OID_FDDI_SHORT_CURRENT_ADDR (unused)" }, - { OID_FDDI_SHORT_MULTICAST_LIST, "OID_FDDI_SHORT_MULTICAST_LIST (unused)" }, - { OID_FDDI_SHORT_MAX_LIST_SIZE, "OID_FDDI_SHORT_MAX_LIST_SIZE (unused)" }, - - /* LocalTalk list is utterly incomplete (contains only the values for MS Loopback Driver) */ - { OID_LTALK_CURRENT_NODE_ID, "OID_LTALK_CURRENT_NODE_ID (unused)" }, - - /* Arcnet list is utterly incomplete (contains only the values for MS Loopback Driver) */ - { OID_ARCNET_PERMANENT_ADDRESS, "OID_ARCNET_PERMANENT_ADDRESS (unused)" }, - { OID_ARCNET_CURRENT_ADDRESS, "OID_ARCNET_CURRENT_ADDRESS (unused)" }, - - { OID_TCP_TASK_OFFLOAD, "OID_TCP_TASK_OFFLOAD" }, - - /* PnP and power management OIDs */ - { OID_PNP_CAPABILITIES, "OID_PNP_CAPABILITIES (unused)" }, - { OID_PNP_SET_POWER, "OID_PNP_SET_POWER (write only)" }, - { OID_PNP_QUERY_POWER, "OID_PNP_QUERY_POWER (unused)" }, - { OID_PNP_ADD_WAKE_UP_PATTERN, "OID_PNP_ADD_WAKE_UP_PATTERN (write only)" }, - { OID_PNP_REMOVE_WAKE_UP_PATTERN, "OID_PNP_REMOVE_WAKE_UP_PATTERN (write only)" }, - { OID_PNP_WAKE_UP_PATTERN_LIST, "OID_PNP_WAKE_UP_PATTERN_LIST (unused)" }, - { OID_PNP_ENABLE_WAKE_UP, "OID_PNP_ENABLE_WAKE_UP (unused)" }, - - /* Unknown OID's (seen on an "Intel(R) PRO/Wireless 2200BG" 802.11 interface) */ - { 0xFF100000, "Unknown 0xFF100000 (unused)" }, - { 0xFF100002, "Unknown 0xFF100002 (unused)" }, - { 0xFF100003, "Unknown 0xFF100003 (unused)" }, - { 0xFF100004, "Unknown 0xFF100004 (unused)" }, - { 0xFF100005, "Unknown 0xFF100005 (unused)" }, - { 0xFF100006, "Unknown 0xFF100006 (unused)" }, - { 0xFF100007, "Unknown 0xFF100007 (unused)" }, - { 0xFF100009, "Unknown 0xFF100009 (unused)" }, - { 0xFF10000b, "Unknown 0xFF10000b (unused)" }, - { 0xFF10000c, "Unknown 0xFF10000c (unused)" }, - { 0xFF10000e, "Unknown 0xFF10000e (unused)" }, - { 0xFF10000f, "Unknown 0xFF10000f (unused)" }, - /* continued by a lot more 0xFF... values */ - - { 0, NULL } -}; + /* Token-Ring list is utterly incomplete (contains only the values for MS Loopback Driver) */ + { OID_802_5_PERMANENT_ADDRESS, "OID_802_5_PERMANENT_ADDRESS (unused)" }, + { OID_802_5_CURRENT_ADDRESS, "OID_802_5_CURRENT_ADDRESS (unused)" }, + { OID_802_5_CURRENT_FUNCTIONAL, "OID_802_5_CURRENT_FUNCTIONAL (unused)" }, + { OID_802_5_CURRENT_GROUP, "OID_802_5_CURRENT_GROUP (unused)" }, + { OID_802_5_LAST_OPEN_STATUS, "OID_802_5_LAST_OPEN_STATUS (unused)" }, + { OID_802_5_CURRENT_RING_STATUS, "OID_802_5_CURRENT_RING_STATUS (unused)" }, + { OID_802_5_CURRENT_RING_STATE, "OID_802_5_CURRENT_RING_STATE (unused)" }, + { OID_802_5_LINE_ERRORS, "OID_802_5_LINE_ERRORS (unused)" }, + { OID_802_5_LOST_FRAMES, "OID_802_5_LOST_FRAMES (unused)" }, + + /* FDDI list is utterly incomplete (contains only the values for MS Loopback Driver) */ + { OID_FDDI_LONG_PERMANENT_ADDR, "OID_FDDI_LONG_PERMANENT_ADDR (unused)" }, + { OID_FDDI_LONG_CURRENT_ADDR, "OID_FDDI_LONG_CURRENT_ADDR (unused)" }, + { OID_FDDI_LONG_MULTICAST_LIST, "OID_FDDI_LONG_MULTICAST_LIST (unused)" }, + { OID_FDDI_LONG_MAX_LIST_SIZE, "OID_FDDI_LONG_MAX_LIST_SIZE (unused)" }, + { OID_FDDI_SHORT_PERMANENT_ADDR, "OID_FDDI_SHORT_PERMANENT_ADDR (unused)" }, + { OID_FDDI_SHORT_CURRENT_ADDR, "OID_FDDI_SHORT_CURRENT_ADDR (unused)" }, + { OID_FDDI_SHORT_MULTICAST_LIST, "OID_FDDI_SHORT_MULTICAST_LIST (unused)" }, + { OID_FDDI_SHORT_MAX_LIST_SIZE, "OID_FDDI_SHORT_MAX_LIST_SIZE (unused)" }, + + /* LocalTalk list is utterly incomplete (contains only the values for MS Loopback Driver) */ + { OID_LTALK_CURRENT_NODE_ID, "OID_LTALK_CURRENT_NODE_ID (unused)" }, + + /* Arcnet list is utterly incomplete (contains only the values for MS Loopback Driver) */ + { OID_ARCNET_PERMANENT_ADDRESS, "OID_ARCNET_PERMANENT_ADDRESS (unused)" }, + { OID_ARCNET_CURRENT_ADDRESS, "OID_ARCNET_CURRENT_ADDRESS (unused)" }, + + { OID_TCP_TASK_OFFLOAD, "OID_TCP_TASK_OFFLOAD" }, + + /* PnP and power management OIDs */ + { OID_PNP_CAPABILITIES, "OID_PNP_CAPABILITIES (unused)" }, + { OID_PNP_SET_POWER, "OID_PNP_SET_POWER (write only)" }, + { OID_PNP_QUERY_POWER, "OID_PNP_QUERY_POWER (unused)" }, + { OID_PNP_ADD_WAKE_UP_PATTERN, "OID_PNP_ADD_WAKE_UP_PATTERN (write only)" }, + { OID_PNP_REMOVE_WAKE_UP_PATTERN, "OID_PNP_REMOVE_WAKE_UP_PATTERN (write only)" }, + { OID_PNP_WAKE_UP_PATTERN_LIST, "OID_PNP_WAKE_UP_PATTERN_LIST (unused)" }, + { OID_PNP_ENABLE_WAKE_UP, "OID_PNP_ENABLE_WAKE_UP (unused)" }, + + /* Unknown OID's (seen on an "Intel(R) PRO/Wireless 2200BG" 802.11 interface) */ + { 0xFF100000, "Unknown 0xFF100000 (unused)" }, + { 0xFF100002, "Unknown 0xFF100002 (unused)" }, + { 0xFF100003, "Unknown 0xFF100003 (unused)" }, + { 0xFF100004, "Unknown 0xFF100004 (unused)" }, + { 0xFF100005, "Unknown 0xFF100005 (unused)" }, + { 0xFF100006, "Unknown 0xFF100006 (unused)" }, + { 0xFF100007, "Unknown 0xFF100007 (unused)" }, + { 0xFF100009, "Unknown 0xFF100009 (unused)" }, + { 0xFF10000b, "Unknown 0xFF10000b (unused)" }, + { 0xFF10000c, "Unknown 0xFF10000c (unused)" }, + { 0xFF10000e, "Unknown 0xFF10000e (unused)" }, + { 0xFF10000f, "Unknown 0xFF10000f (unused)" }, + /* continued by a lot more 0xFF... values */ + { 0, NULL } +}; +#endif /***************************************************************************/ /* debug functions, query or list supported NDIS OID's */ - +#if 0 static void supported_list(LPADAPTER adapter) { - unsigned char values[10000]; - int length; + unsigned char values[10000]; + int length; g_warning("supported_list_unhandled"); length = sizeof(values); if (wpcap_packet_request(adapter, OID_GEN_SUPPORTED_LIST, FALSE /* !set */, values, &length)) { - guint32 *value = (guint32 *) values; + guint32 *value = (guint32 *)values; - while (length>=4) { + while (length >= 4) { printf("OID: 0x%08X %s\n", *value, val_to_str(*value, oid_vals, "unknown")); value++; - length-=4; + length -= 4; } } } @@ -675,26 +677,26 @@ supported_list(LPADAPTER adapter) static gboolean supported_query_oid(LPADAPTER adapter, guint32 oid) { - unsigned char values[10000]; - int length; + unsigned char values[10000]; + int length; length = sizeof(values); if (wpcap_packet_request(adapter, OID_GEN_SUPPORTED_LIST, FALSE /* !set */, values, &length)) { guint32 *value = (guint32 *) values; - while (length>=4) { - if(*value == oid) { + while (length >= 4) { + if (*value == oid) { return TRUE; } value++; - length-=4; + length -= 4; } } return FALSE; } - +#endif /******************************************************************************/ /* info functions, get and display various NDIS driver values */ @@ -705,7 +707,7 @@ supported_query_oid(LPADAPTER adapter, guint32 oid) GtkWidget *val_lb; static GtkWidget * -add_meter_to_table(GtkWidget *list, guint *row, gchar *title, +add_meter_to_grid(GtkWidget *grid, guint *row, gchar *title, int value, gchar *value_title, int min, int max, int yellow_level, @@ -721,7 +723,7 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title, label = gtk_label_new(indent); g_free(indent); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(list), label, 0, 1, *row, *row+1, GTK_EXPAND|GTK_FILL, 0, 0,0); + ws_gtk_grid_attach_extended(GTK_GRID(grid), label, 0, *row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0,0); /* the level meter */ main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE); @@ -737,7 +739,7 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title, gtk_vumeter_set_scale_hole_size (GTK_VUMETER(meter), 2); gtk_vumeter_set_colors_inverted (GTK_VUMETER(meter), TRUE); - if(scale) { + if (scale) { gtk_vumeter_set_scale_items(GTK_VUMETER(meter), scale); } @@ -759,9 +761,9 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title, FALSE /*fill*/, 0 /* padding */); - gtk_table_attach(GTK_TABLE(list), main_hb, 1, 2, *row, *row+1, GTK_EXPAND|GTK_FILL, 0, 0,0); + ws_gtk_grid_attach_extended(GTK_GRID(grid), main_hb, 1, *row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0,0); - *row = *row + 1; + *row += 1; return meter; } @@ -769,12 +771,12 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title, #endif static void -add_row_to_table(GtkWidget *list, guint *row, gchar *title, const gchar *value, gboolean sensitive) +add_row_to_grid(GtkWidget *grid, guint *row, gchar *title, const gchar *value, gboolean sensitive) { GtkWidget *label; gchar *indent; - if(strlen(value) != 0) { + if (strlen(value) != 0) { indent = g_strdup_printf(" %s", title); } else { indent = g_strdup(title); @@ -783,63 +785,63 @@ add_row_to_table(GtkWidget *list, guint *row, gchar *title, const gchar *value, g_free(indent); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_set_sensitive(label, sensitive); - gtk_table_attach(GTK_TABLE(list), label, 0, 1, *row, *row+1, GTK_EXPAND | GTK_FILL, 0, 0,0); + ws_gtk_grid_attach_extended(GTK_GRID(grid), label, 0, *row, 1, 1, GTK_EXPAND | GTK_FILL, 0, 0,0); label = gtk_label_new(value); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_set_sensitive(label, sensitive); - gtk_table_attach(GTK_TABLE(list), label, 1, 2, *row, *row+1, GTK_EXPAND | GTK_FILL, 0, 0,0); + ws_gtk_grid_attach_extended(GTK_GRID(grid), label, 1, *row, 1, 1, GTK_EXPAND | GTK_FILL, 0, 0,0); - *row = *row + 1; + *row += 1; } +#if 0 static void -add_string_to_table_sensitive(GtkWidget *list, guint *row, gchar *title, gchar *value, gboolean sensitive) +add_string_to_grid_sensitive(GtkWidget *grid, guint *row, gchar *title, gchar *value, gboolean sensitive) { - add_row_to_table(list, row, title, value, sensitive); + add_row_to_grid(grid, row, title, value, sensitive); } - +#endif static void -add_string_to_table(GtkWidget *list, guint *row, gchar *title, const gchar *value) +add_string_to_grid(GtkWidget *grid, guint *row, gchar *title, const gchar *value) { - add_row_to_table(list, row, title, value, TRUE); + add_row_to_grid(grid, row, title, value, TRUE); } static void -ssid_details(GtkWidget *table, guint *row, struct ndis_essid *ssid_in) { +ssid_details(GtkWidget *grid, guint *row, struct ndis_essid *ssid_in) { struct ndis_essid ssid[2]; /* prevent an off by one error */ - ssid[0] = *ssid_in; g_assert(ssid->length <= NDIS_ESSID_MAX_SIZE); - if(ssid->length != 0) { + if (ssid->length != 0) { ssid->essid[ssid->length] = '\0'; - add_string_to_table(table, row, "SSID (Service Set IDentifier)", ssid->essid); + add_string_to_grid(grid, row, "SSID (Service Set IDentifier)", ssid->essid); } else { - add_string_to_table(table, row, "SSID (Service Set IDentifier)", "(currently not associated with an SSID)"); + add_string_to_grid(grid, row, "SSID (Service Set IDentifier)", "(currently not associated with an SSID)"); } } static GString * rates_details(unsigned char *values, int length) { - int i; - GString *Rates; - float float_value; - int int_value; + int i; + GString *Rates; + float float_value; + int int_value; Rates = g_string_new(""); - if(length != 0) { + if (length != 0) { i = 0; - while(length--) { - if(values[i]) { - if(i != 0) { + while (length--) { + if (values[i]) { + if (i != 0) { g_string_append(Rates, "/"); } @@ -847,7 +849,7 @@ rates_details(unsigned char *values, int length) { /* reduce the screen estate by showing fractions only where required */ int_value = (int)float_value; - if(float_value == (float)int_value) { + if (float_value == (float)int_value) { g_string_append_printf(Rates, "%.0f", float_value); } else { g_string_append_printf(Rates, "%.1f", float_value); @@ -868,14 +870,13 @@ rates_details(unsigned char *values, int length) { static GList * rates_vu_list(unsigned char *values, int length, int *max) { - int i; + int i; GList *Rates = NULL; - GtkVUMeterScaleItem * item; - + GtkVUMeterScaleItem *item; *max = 0; - if(length == 0) { + if (length == 0) { return NULL; } @@ -890,10 +891,10 @@ rates_vu_list(unsigned char *values, int length, int *max) for(i=0; i<length; i++) { gint level; - if(values[i]) { + if (values[i]) { level = (values[i] & 0x7F) / 2; - if(level > *max) { + if (level > *max) { *max = level; } } @@ -909,7 +910,7 @@ rates_vu_list(unsigned char *values, int length, int *max) Rates = g_list_append(Rates, item); for(i=0; i<length; i++) { - if(values[i]) { + if (values[i]) { /* reduce the screen estate by showing fractions only where required */ item = g_malloc(sizeof(GtkVUMeterScaleItem)); @@ -923,59 +924,59 @@ rates_vu_list(unsigned char *values, int length, int *max) /* 802.11n: ? */ /* proprietary: 108 */ - switch(item->level) { - case 2: - if(*max >= 108) { + switch (item->level) { + case 2: + if (*max >= 108) { + item->large = FALSE; + item->label = NULL; + } else { + item->large = TRUE; + item->label = "2"; + } + break; + case 5: + item->large = TRUE; + item->label = "5.5"; + break; + case 11: + item->large = TRUE; + item->label = "11"; + break; + case 18: + item->large = TRUE; + item->label = "18"; + break; + case 24: + item->large = TRUE; + item->label = "24"; + break; + case 36: + item->large = TRUE; + item->label = "36"; + break; + case 48: + item->large = TRUE; + item->label = "48"; + break; + case 54: + item->large = TRUE; + item->label = "54"; + break; + case 72: /* XXX */ + item->large = TRUE; + item->label = "72"; + break; + case 96: /* XXX */ + item->large = TRUE; + item->label = "96"; + break; + case 108: + item->large = TRUE; + item->label = "108"; + break; + default: item->large = FALSE; item->label = NULL; - } else { - item->large = TRUE; - item->label = "2"; - } - break; - case 5: - item->large = TRUE; - item->label = "5.5"; - break; - case 11: - item->large = TRUE; - item->label = "11"; - break; - case 18: - item->large = TRUE; - item->label = "18"; - break; - case 24: - item->large = TRUE; - item->label = "24"; - break; - case 36: - item->large = TRUE; - item->label = "36"; - break; - case 48: - item->large = TRUE; - item->label = "48"; - break; - case 54: - item->large = TRUE; - item->label = "54"; - break; - case 72: /* XXX */ - item->large = TRUE; - item->label = "72"; - break; - case 96: /* XXX */ - item->large = TRUE; - item->label = "96"; - break; - case 108: - item->large = TRUE; - item->label = "108"; - break; - default: - item->large = FALSE; - item->label = NULL; } Rates = g_list_append(Rates, item); @@ -991,7 +992,8 @@ rates_vu_list(unsigned char *values, int length, int *max) static void hex(unsigned char *p, int len) { int i = 0; - while(len) { + + while (len) { g_warning("%u: 0x%x (%u) '%c'", i, *p, *p, isprint(*p) ? *p : '.'); @@ -1005,41 +1007,42 @@ hex(unsigned char *p, int len) { static void capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list *bssid_list) { - struct ndis_ssid_item *bssid_item; - unsigned char mac[6]; - const gchar *manuf_name; - GString *Rates; - - - if(bssid_list->num_items != 0) { - char *titles[] = { "SSID", "MAC", "Vendor", "Privacy", "RSSI" , "Network Type" , "Infra. Mode" , "Ch." , "Rates", "Country" }; - GtkWidget *list; - gboolean privacy_required; - gboolean privacy_wpa; - gboolean privacy_wpa2; - - gchar ssid_buff[DETAILS_STR_MAX]; - gchar mac_buff[DETAILS_STR_MAX]; - gchar vendor_buff[DETAILS_STR_MAX]; - gchar privacy_buff[DETAILS_STR_MAX]; - gchar rssi_buff[DETAILS_STR_MAX]; - gchar nettype_buff[DETAILS_STR_MAX]; - gchar infra_buff[DETAILS_STR_MAX]; - gchar freq_buff[DETAILS_STR_MAX]; - gchar country_buff[DETAILS_STR_MAX] = ""; + struct ndis_ssid_item *bssid_item; + unsigned char mac[6]; + const gchar *manuf_name; + GString *Rates; + + + if (bssid_list->num_items != 0) { + char *titles[] = { "SSID", "MAC", "Vendor", "Privacy", "RSSI" , "Network Type" , + "Infra. Mode" , "Ch." , "Rates", "Country" }; + GtkWidget *list; + gboolean privacy_required; + gboolean privacy_wpa; + gboolean privacy_wpa2; + + gchar ssid_buff [DETAILS_STR_MAX]; + gchar mac_buff [DETAILS_STR_MAX]; + gchar vendor_buff [DETAILS_STR_MAX]; + gchar privacy_buff [DETAILS_STR_MAX]; + gchar rssi_buff [DETAILS_STR_MAX]; + gchar nettype_buff [DETAILS_STR_MAX]; + gchar infra_buff [DETAILS_STR_MAX]; + gchar freq_buff [DETAILS_STR_MAX]; + gchar country_buff [DETAILS_STR_MAX] = ""; list = simple_list_new(10, titles); gtk_box_pack_start(GTK_BOX(main_vb), list, TRUE /*expand*/, TRUE /*fill*/, 0 /* padding */); bssid_item = &bssid_list->items[0]; - while(bssid_list->num_items--) { + while (bssid_list->num_items--) { privacy_required = FALSE; privacy_wpa = FALSE; privacy_wpa2 = FALSE; /* SSID */ - if(bssid_item->ssid.length > DETAILS_STR_MAX-1) { + if (bssid_item->ssid.length > DETAILS_STR_MAX-1) { bssid_item->ssid.length = DETAILS_STR_MAX-1; } memcpy(ssid_buff, bssid_item->ssid.essid, bssid_item->ssid.length); @@ -1053,7 +1056,7 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list /* Vendor */ manuf_name = get_manuf_name_if_known(mac); - if(manuf_name != NULL) { + if (manuf_name != NULL) { g_strlcpy(vendor_buff, manuf_name, DETAILS_STR_MAX); } else { vendor_buff[0] = '\0'; @@ -1067,7 +1070,7 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list /* Privacy */ /* (flag is set, if WEP (or higher) privacy is required) */ - if(bssid_item->privacy) { + if (bssid_item->privacy) { privacy_required = TRUE; } @@ -1087,85 +1090,85 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list { int len = bssid_item->ie_length; unsigned char *iep = bssid_item->ies; - unsigned char id; + unsigned char id; guint el_len; NDIS_802_11_FIXED_IEs *fixed_ies; /*#define DEBUG_IE*/ #ifdef DEBUG_IE - const gchar *manuf_name; + const gchar *manuf_name; gchar string_buff[DETAILS_STR_MAX]; #endif - fixed_ies = (NDIS_802_11_FIXED_IEs *) iep; + fixed_ies = (NDIS_802_11_FIXED_IEs *)iep; -#if 0 - UCHAR Timestamp[8]; - USHORT BeaconInterval; - USHORT Capabilities; -} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; -#endif +/** + UCHAR Timestamp[8]; + USHORT BeaconInterval; + USHORT Capabilities; + } NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; +**/ iep += sizeof(NDIS_802_11_FIXED_IEs); len = bssid_item->ie_length - sizeof(NDIS_802_11_FIXED_IEs); - while(len >= 2) { + while (len >= 2) { id = *iep; iep++; el_len = *iep; iep++; - len-=2; + len -= 2; #ifdef DEBUG_IE g_warning("ID: %s (%u) Len: %u", val_to_str(id, ie_id_vals, "0x%x"), id, el_len); #endif - switch(id) { - case(IE_ID_COUNTRY): - if(el_len >= 6) - g_snprintf(country_buff, sizeof(country_buff), "%c%c: Ch: %u-%u Max: %ddBm", - iep[0], iep[1], iep[3], iep[4], iep[5]); - break; - case(IE_ID_WPA2): - privacy_wpa2 = TRUE; - break; - case(IE_ID_VENDOR_SPECIFIC): /* WPA */ - privacy_wpa = TRUE; + switch (id) { + case(IE_ID_COUNTRY): + if (el_len >= 6) + g_snprintf(country_buff, sizeof(country_buff), "%c%c: Ch: %u-%u Max: %ddBm", + iep[0], iep[1], iep[3], iep[4], iep[5]); + break; + case(IE_ID_WPA2): + privacy_wpa2 = TRUE; + break; + case(IE_ID_VENDOR_SPECIFIC): /* WPA */ + privacy_wpa = TRUE; #ifdef DEBUG_IE - /* include information from epan/packet-ieee80211.c dissect_vendor_ie_wpawme() */ - manuf_name = get_manuf_name_if_known(iep); - if(manuf_name != NULL) { - g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X (%s) Type: %02X", - *(iep), *(iep+1), *(iep+2), manuf_name, *(iep+3)); - } else { - g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X Type: %02X", - *(iep), *(iep+1), *(iep+2), *(iep+3)); - } - - g_warning("%s", string_buff); - iep += 4; - el_len-= 4; - len -= 4; - - g_warning("WPA IE: %u", id); - hex(iep, el_len); + /* include information from epan/packet-ieee80211.c dissect_vendor_ie_wpawme() */ + manuf_name = get_manuf_name_if_known(iep); + if (manuf_name != NULL) { + g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X (%s) Type: %02X", + *(iep), *(iep+1), *(iep+2), manuf_name, *(iep+3)); + } else { + g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X Type: %02X", + *(iep), *(iep+1), *(iep+2), *(iep+3)); + } + + g_warning("%s", string_buff); + iep += 4; + el_len-= 4; + len -= 4; + + g_warning("WPA IE: %u", id); + hex(iep, el_len); #endif - break; - - case(IE_ID_SSID): - case(IE_ID_SUPPORTED_RATES): - case(IE_ID_DS_PARAMETER_SET): - case(IE_ID_TIM): - case(IE_ID_ERP_INFORMATION): - case(IE_ID_EXTENDED_SUPPORT_RATES): - /* we already have that data, do nothing */ - break; - default: - /* unexpected IE_ID, print out hexdump */ - g_warning("Unknown IE ID: %u Len: %u", id, el_len); - hex(iep, el_len); + break; + + case(IE_ID_SSID): + case(IE_ID_SUPPORTED_RATES): + case(IE_ID_DS_PARAMETER_SET): + case(IE_ID_TIM): + case(IE_ID_ERP_INFORMATION): + case(IE_ID_EXTENDED_SUPPORT_RATES): + /* we already have that data, do nothing */ + break; + default: + /* unexpected IE_ID, print out hexdump */ + g_warning("Unknown IE ID: %u Len: %u", id, el_len); + hex(iep, el_len); } iep += el_len; @@ -1173,13 +1176,13 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list } } - if(privacy_required) { - if(privacy_wpa2) { + if (privacy_required) { + if (privacy_wpa2) { /* XXX - how to detect data encryption (TKIP and AES)? */ /* XXX - how to detect authentication (PSK or not)? */ g_snprintf(privacy_buff, DETAILS_STR_MAX, "WPA2"); } else { - if(privacy_wpa) { + if (privacy_wpa) { /* XXX - how to detect data encryption (TKIP and AES)? */ /* XXX - how to detect authentication (PSK or not)? */ g_snprintf(privacy_buff, DETAILS_STR_MAX, "WPA"); @@ -1214,31 +1217,31 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list } static int -capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { - ULONG ulong_value; - LONG rssi = -100; - unsigned int uint_value; - unsigned char values[100]; - struct ndis_essid ssid; - int length; - struct ndis_bssid_list *bssid_list; - struct ndis_configuration *configuration; - gchar string_buff[DETAILS_STR_MAX]; - GString *Rates; - int entries = 0; - const gchar *manuf_name; - - - add_string_to_table(table, row, "Current network", ""); +capture_if_details_802_11(GtkWidget *grid, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { + ULONG ulong_value; + LONG rssi = -100; + unsigned int uint_value; + unsigned char values[100]; + struct ndis_essid ssid; + int length; + gchar string_buff[DETAILS_STR_MAX]; + GString *Rates; + int entries = 0; + const gchar *manuf_name; + struct ndis_bssid_list *bssid_list; + struct ndis_configuration *configuration; + + + add_string_to_grid(grid, row, "Current network", ""); /* SSID */ length = sizeof(struct ndis_essid); memset(&ssid, 0, length); if (wpcap_packet_request(adapter, OID_802_11_SSID, FALSE /* !set */, (char *) &ssid, &length)) { - ssid_details(table, row, &ssid); + ssid_details(grid, row, &ssid); entries++; } else { - add_string_to_table(table, row, "SSID (Service Set IDentifier)", "-"); + add_string_to_grid(grid, row, "SSID (Service Set IDentifier)", "-"); } /* BSSID */ @@ -1246,7 +1249,7 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD memset(values, 0, 6); if (wpcap_packet_request(adapter, OID_802_11_BSSID, FALSE /* !set */, values, &length)) { manuf_name = get_manuf_name_if_known(values); - if(manuf_name != NULL) { + if (manuf_name != NULL) { g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X:%02X:%02X:%02X (%s)", values[0], values[1], values[2], values[3], values[4], values[5], @@ -1260,51 +1263,51 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "BSSID (Basic Service Set IDentifier)", string_buff); + add_string_to_grid(grid, row, "BSSID (Basic Service Set IDentifier)", string_buff); /* Network type in use */ if (wpcap_packet_request_uint(adapter, OID_802_11_NETWORK_TYPE_IN_USE, &uint_value)) { - add_string_to_table(table, row, "Network type used", + add_string_to_grid(grid, row, "Network type used", val_to_str(uint_value, win32_802_11_network_type_vals, "(0x%x)")); entries++; } else { - add_string_to_table(table, row, "Network type used", "-"); + add_string_to_grid(grid, row, "Network type used", "-"); } /* Infrastructure mode */ if (wpcap_packet_request_ulong(adapter, OID_802_11_INFRASTRUCTURE_MODE, &uint_value)) { - add_string_to_table(table, row, "Infrastructure mode", + add_string_to_grid(grid, row, "Infrastructure mode", val_to_str(uint_value, win32_802_11_infra_mode_vals, "(0x%x)")); entries++; } else { - add_string_to_table(table, row, "Infrastructure mode", "-"); + add_string_to_grid(grid, row, "Infrastructure mode", "-"); } /* Authentication mode */ if (wpcap_packet_request_ulong(adapter, OID_802_11_AUTHENTICATION_MODE, &uint_value)) { - add_string_to_table(table, row, "Authentication mode", + add_string_to_grid(grid, row, "Authentication mode", val_to_str(uint_value, win32_802_11_auth_mode_vals, "(0x%x)")); entries++; } else { - add_string_to_table(table, row, "Authentication mode", "-"); + add_string_to_grid(grid, row, "Authentication mode", "-"); } /* Encryption (WEP) status */ if (wpcap_packet_request_ulong(adapter, OID_802_11_ENCRYPTION_STATUS, &uint_value)) { - add_string_to_table(table, row, "Encryption status", + add_string_to_grid(grid, row, "Encryption status", val_to_str(uint_value, win32_802_11_encryption_status_vals, "(0x%x)")); entries++; } else { - add_string_to_table(table, row, "Encryption status", "-"); + add_string_to_grid(grid, row, "Encryption status", "-"); } /* TX power */ if (wpcap_packet_request_ulong(adapter, OID_802_11_TX_POWER_LEVEL, &ulong_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%ld mW", ulong_value); - add_string_to_table(table, row, "TX power", string_buff); + add_string_to_grid(grid, row, "TX power", string_buff); entries++; } else { - add_string_to_table(table, row, "TX power", "-"); + add_string_to_grid(grid, row, "TX power", "-"); } /* RSSI */ @@ -1323,38 +1326,38 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD item->large = !(i%5); item->label = NULL; - switch(item->level) { - case 0: - item->label = "-100 "; - break; - case 20: - item->label = "-80 "; - break; - case 40: - item->label = "-60 "; - break; - case 60: - item->label = "-40 "; - break; - case 80: - item->label = "-20 "; - break; - case 100: - item->label = "0"; - break; - default: - item->label = NULL; + switch (item->level) { + case 0: + item->label = "-100 "; + break; + case 20: + item->label = "-80 "; + break; + case 40: + item->label = "-60 "; + break; + case 60: + item->label = "-40 "; + break; + case 80: + item->label = "-20 "; + break; + case 100: + item->label = "0"; + break; + default: + item->label = NULL; } scale_items = g_list_append(scale_items, item); } - if(rssi < -100) { + if (rssi < -100) { rssi = -100; } g_snprintf(string_buff, DETAILS_STR_MAX, "%ld dBm", rssi); - add_meter_to_table(table, row, "RSSI (Received Signal Strength Indication)", + add_meter_to_grid(grid, row, "RSSI (Received Signal Strength Indication)", rssi+100 , string_buff, -100+100, 0+100, -80+100, scale_items); current = scale_items; while (current != NULL) { @@ -1366,7 +1369,7 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD entries++; #endif } else { - add_string_to_table(table, row, "RSSI (Received Signal Strength Indication)", "-"); + add_string_to_grid(grid, row, "RSSI (Received Signal Strength Indication)", "-"); } /* Supported Rates */ @@ -1384,26 +1387,26 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD int yellow; GList *rates_list; - GList * current; + GList * current; - rates_list = rates_vu_list(values, length, &max); + rates_list = rates_vu_list(values, length, &max); /* if we don't have a signal, we might not have a valid link speed */ - if(rssi == -100) { + if (rssi == -100) { uint_value = 0; } uint_value /= 10 * 1000; g_snprintf(string_buff, DETAILS_STR_MAX, "%u MBits/s", uint_value); - if(max >= 54) { + if (max >= 54) { yellow = 2; } else { yellow = 1; } - add_meter_to_table(table, row, "Link Speed", + add_meter_to_grid(grid, row, "Link Speed", uint_value, string_buff, 0, max, yellow, rates_list); current = rates_list; while (current != NULL) { @@ -1417,7 +1420,7 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD /* Supported Rates in String format */ Rates = rates_details(values, length); - add_string_to_table(table, row, "Supported Rates", Rates->str); + add_string_to_grid(grid, row, "Supported Rates", Rates->str); g_string_free(Rates, TRUE /* free_segment */); /* Desired Rates */ @@ -1429,7 +1432,7 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD } Rates = rates_details(values, length); - add_string_to_table(table, row, "Desired Rates", Rates->str); + add_string_to_grid(grid, row, "Desired Rates", Rates->str); g_string_free(Rates, TRUE /* free_segment */); /* Configuration (e.g. frequency) */ @@ -1437,11 +1440,11 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD if (wpcap_packet_request(adapter, OID_802_11_CONFIGURATION, FALSE /* !set */, (char *) values, &length)) { configuration = (struct ndis_configuration *) values; - add_string_to_table(table, row, "Channel", + add_string_to_grid(grid, row, "Channel", val_to_str(configuration->ds_config, win32_802_11_channel_freq_vals, "(%u kHz)")); entries++; } else { - add_string_to_table(table, row, "Channel", "-"); + add_string_to_grid(grid, row, "Channel", "-"); } /* BSSID list: first trigger a scan */ @@ -1456,20 +1459,20 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD /* BSSID list: get scan results */ /* XXX - we might have to wait up to 7 seconds! */ - length = sizeof(ULONG) + sizeof(struct ndis_ssid_item) * 16; - bssid_list = g_malloc(length); - /* some drivers don't set bssid_list->num_items to 0 if - OID_802_11_BSSID_LIST returns no items (prism54 driver, e.g.,) */ - memset(bssid_list, 0, length); + length = sizeof(ULONG) + sizeof(struct ndis_ssid_item) * 16; + bssid_list = g_malloc(length); + /* some drivers don't set bssid_list->num_items to 0 if + OID_802_11_BSSID_LIST returns no items (prism54 driver, e.g.,) */ + memset(bssid_list, 0, length); if (wpcap_packet_request(adapter, OID_802_11_BSSID_LIST, FALSE /* !set */, (char *) bssid_list, &length)) { - add_string_to_table(table, row, "", ""); - add_string_to_table(table, row, "Available networks (BSSID list)", ""); + add_string_to_grid(grid, row, "", ""); + add_string_to_grid(grid, row, "Available networks (BSSID list)", ""); capture_if_details_802_11_bssid_list(main_vb, bssid_list); entries += bssid_list->num_items; } else { - add_string_to_table(table, row, "Available networks (BSSID list)", "-"); + add_string_to_grid(grid, row, "Available networks (BSSID list)", "-"); } g_free(bssid_list); @@ -1479,21 +1482,21 @@ capture_if_details_802_11(GtkWidget *table, GtkWidget *main_vb, guint *row, LPAD static int -capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { - unsigned int uint_value; - unsigned char values[100]; - int length; - gchar string_buff[DETAILS_STR_MAX]; - const gchar *manuf_name; - int entries = 0; +capture_if_details_802_3(GtkWidget *grid, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { + unsigned int uint_value; + unsigned char values[100]; + int length; + gchar string_buff[DETAILS_STR_MAX]; + const gchar *manuf_name; + int entries = 0; - add_string_to_table(table, row, "Characteristics", ""); + add_string_to_grid(grid, row, "Characteristics", ""); length = sizeof(values); if (wpcap_packet_request(adapter, OID_802_3_PERMANENT_ADDRESS, FALSE /* !set */, values, &length)) { manuf_name = get_manuf_name_if_known(values); - if(manuf_name != NULL) { + if (manuf_name != NULL) { g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X:%02X:%02X:%02X (%s)", values[0], values[1], values[2], values[3], values[4], values[5], @@ -1507,12 +1510,12 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Permanent station address", string_buff); + add_string_to_grid(grid, row, "Permanent station address", string_buff); length = sizeof(values); if (wpcap_packet_request(adapter, OID_802_3_CURRENT_ADDRESS, FALSE /* !set */, values, &length)) { manuf_name = get_manuf_name_if_known(values); - if(manuf_name != NULL) { + if (manuf_name != NULL) { g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X:%02X:%02X:%02X (%s)", values[0], values[1], values[2], values[3], values[4], values[5], @@ -1526,11 +1529,11 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Current station address", string_buff); + add_string_to_grid(grid, row, "Current station address", string_buff); - add_string_to_table(table, row, "", ""); - add_string_to_table(table, row, "Statistics", ""); + add_string_to_grid(grid, row, "", ""); + add_string_to_grid(grid, row, "Statistics", ""); if (wpcap_packet_request_uint(adapter, OID_802_3_RCV_ERROR_ALIGNMENT, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1538,7 +1541,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets received with alignment error", string_buff); + add_string_to_grid(grid, row, "Packets received with alignment error", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_ONE_COLLISION, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1546,7 +1549,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets transmitted with one collision", string_buff); + add_string_to_grid(grid, row, "Packets transmitted with one collision", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_MORE_COLLISIONS, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1554,7 +1557,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets transmitted with more than one collision", string_buff); + add_string_to_grid(grid, row, "Packets transmitted with more than one collision", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_RCV_OVERRUN, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1562,7 +1565,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets not received due to overrun", string_buff); + add_string_to_grid(grid, row, "Packets not received due to overrun", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_DEFERRED, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1570,7 +1573,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets transmitted after deferred", string_buff); + add_string_to_grid(grid, row, "Packets transmitted after deferred", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_MAX_COLLISIONS, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1578,7 +1581,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets not transmitted due to collisions", string_buff); + add_string_to_grid(grid, row, "Packets not transmitted due to collisions", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_UNDERRUN, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1586,7 +1589,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets not transmitted due to underrun", string_buff); + add_string_to_grid(grid, row, "Packets not transmitted due to underrun", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_HEARTBEAT_FAILURE, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1594,7 +1597,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets transmitted with heartbeat failure", string_buff); + add_string_to_grid(grid, row, "Packets transmitted with heartbeat failure", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_TIMES_CRS_LOST, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1602,7 +1605,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Times carrier sense signal lost during transmission", string_buff); + add_string_to_grid(grid, row, "Times carrier sense signal lost during transmission", string_buff); if (wpcap_packet_request_uint(adapter, OID_802_3_XMIT_LATE_COLLISIONS, &uint_value)) { g_snprintf(string_buff, DETAILS_STR_MAX, "%d", uint_value); @@ -1610,7 +1613,7 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Times late collisions detected", string_buff); + add_string_to_grid(grid, row, "Times late collisions detected", string_buff); return entries; } @@ -1618,13 +1621,13 @@ capture_if_details_802_3(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA static int capture_if_details_task_offload(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { NDIS_TASK_OFFLOAD_HEADER *offload; - unsigned char values[10000]; - int length; - gchar string_buff[DETAILS_STR_MAX]; - int entries = 0; - int TcpIpChecksumSupported = 0; - int IpSecSupported = 0; - int TcpLargeSendSupported = 0; + unsigned char values[10000]; + int length; + gchar string_buff[DETAILS_STR_MAX]; + int entries = 0; + int TcpIpChecksumSupported = 0; + int IpSecSupported = 0; + int TcpLargeSendSupported = 0; /* Task Offload */ @@ -1649,139 +1652,139 @@ capture_if_details_task_offload(GtkWidget *table, GtkWidget *main_vb, guint *row do { of = (NDIS_TASK_OFFLOAD *) valuep; - switch(of->Task) { - case TcpIpChecksumNdisTask: + switch (of->Task) { + case TcpIpChecksumNdisTask: { NDIS_TASK_TCP_IP_CHECKSUM *tic = (NDIS_TASK_TCP_IP_CHECKSUM *) (of->TaskBuffer); entries++; TcpIpChecksumSupported++; - add_string_to_table(table, row, "TCP/IP Checksum", ""); + add_string_to_grid(table, row, "TCP/IP Checksum", ""); g_snprintf(string_buff, DETAILS_STR_MAX, ""); - add_string_to_table(table, row, "V4 transmit checksum", ""); + add_string_to_grid(table, row, "V4 transmit checksum", ""); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, UDP: %s, IP: %s", - tic->V4Transmit.TcpChecksum ? "Yes" : "No", - tic->V4Transmit.UdpChecksum ? "Yes" : "No", - tic->V4Transmit.IpChecksum ? "Yes" : "No"); - add_string_to_table(table, row, "Calculation supported", string_buff); + tic->V4Transmit.TcpChecksum ? "Yes" : "No", + tic->V4Transmit.UdpChecksum ? "Yes" : "No", + tic->V4Transmit.IpChecksum ? "Yes" : "No"); + add_string_to_grid(table, row, "Calculation supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, IP: %s", - tic->V4Transmit.TcpOptionsSupported ? "Yes" : "No", - tic->V4Transmit.IpOptionsSupported ? "Yes" : "No"); - add_string_to_table(table, row, "Options fields supported", string_buff); + tic->V4Transmit.TcpOptionsSupported ? "Yes" : "No", + tic->V4Transmit.IpOptionsSupported ? "Yes" : "No"); + add_string_to_grid(table, row, "Options fields supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, ""); - add_string_to_table(table, row, "V4 receive checksum", ""); + add_string_to_grid(table, row, "V4 receive checksum", ""); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, UDP: %s, IP: %s", - tic->V4Receive.TcpChecksum ? "Yes" : "No", - tic->V4Receive.UdpChecksum ? "Yes" : "No", - tic->V4Receive.IpChecksum ? "Yes" : "No"); - add_string_to_table(table, row, "Validation supported", string_buff); + tic->V4Receive.TcpChecksum ? "Yes" : "No", + tic->V4Receive.UdpChecksum ? "Yes" : "No", + tic->V4Receive.IpChecksum ? "Yes" : "No"); + add_string_to_grid(table, row, "Validation supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, IP: %s", - tic->V4Receive.TcpOptionsSupported ? "Yes" : "No", - tic->V4Receive.IpOptionsSupported ? "Yes" : "No"); - add_string_to_table(table, row, "Options fields supported", string_buff); + tic->V4Receive.TcpOptionsSupported ? "Yes" : "No", + tic->V4Receive.IpOptionsSupported ? "Yes" : "No"); + add_string_to_grid(table, row, "Options fields supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, ""); - add_string_to_table(table, row, "V6 transmit checksum", ""); + add_string_to_grid(table, row, "V6 transmit checksum", ""); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, UDP: %s", - tic->V6Transmit.TcpChecksum ? "Yes" : "No", - tic->V6Transmit.UdpChecksum ? "Yes" : "No"); - add_string_to_table(table, row, "Calculation supported", string_buff); + tic->V6Transmit.TcpChecksum ? "Yes" : "No", + tic->V6Transmit.UdpChecksum ? "Yes" : "No"); + add_string_to_grid(table, row, "Calculation supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, IP: %s", - tic->V6Transmit.TcpOptionsSupported ? "Yes" : "No", - tic->V6Transmit.IpOptionsSupported ? "Yes" : "No"); - add_string_to_table(table, row, "Options fields supported", string_buff); + tic->V6Transmit.TcpOptionsSupported ? "Yes" : "No", + tic->V6Transmit.IpOptionsSupported ? "Yes" : "No"); + add_string_to_grid(table, row, "Options fields supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, ""); - add_string_to_table(table, row, "V6 receive checksum", ""); + add_string_to_grid(table, row, "V6 receive checksum", ""); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, UDP: %s", - tic->V6Receive.TcpChecksum ? "Yes" : "No", - tic->V6Receive.UdpChecksum ? "Yes" : "No"); - add_string_to_table(table, row, "Validation supported", string_buff); + tic->V6Receive.TcpChecksum ? "Yes" : "No", + tic->V6Receive.UdpChecksum ? "Yes" : "No"); + add_string_to_grid(table, row, "Validation supported", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "TCP: %s, IP: %s", - tic->V6Receive.TcpOptionsSupported ? "Yes" : "No", - tic->V6Receive.IpOptionsSupported ? "Yes" : "No"); - add_string_to_table(table, row, "Options fields supported", string_buff); + tic->V6Receive.TcpOptionsSupported ? "Yes" : "No", + tic->V6Receive.IpOptionsSupported ? "Yes" : "No"); + add_string_to_grid(table, row, "Options fields supported", string_buff); } break; - case IpSecNdisTask: - entries++; - IpSecSupported++; + case IpSecNdisTask: + entries++; + IpSecSupported++; - add_string_to_table(table, row, "IPSEC", ""); - g_snprintf(string_buff, DETAILS_STR_MAX, "IPSEC (TaskID 1) not decoded yet"); - add_string_to_table(table, row, "Task", string_buff); - break; - case TcpLargeSendNdisTask: + add_string_to_grid(table, row, "IPSEC", ""); + g_snprintf(string_buff, DETAILS_STR_MAX, "IPSEC (TaskID 1) not decoded yet"); + add_string_to_grid(table, row, "Task", string_buff); + break; + case TcpLargeSendNdisTask: { NDIS_TASK_TCP_LARGE_SEND *tls = (NDIS_TASK_TCP_LARGE_SEND *) (of->TaskBuffer); entries++; TcpLargeSendSupported++; - add_string_to_table(table, row, "TCP large send", ""); + add_string_to_grid(table, row, "TCP large send", ""); /* XXX - while MSDN tells about version 0, we see version 1?!? */ - if(tls->Version == 1) { + if (tls->Version == 1) { g_snprintf(string_buff, DETAILS_STR_MAX, "%u", tls->MaxOffLoadSize); - add_string_to_table(table, row, "Max Offload Size", string_buff); + add_string_to_grid(table, row, "Max Offload Size", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "%u", tls->MinSegmentCount); - add_string_to_table(table, row, "Min Segment Count", string_buff); + add_string_to_grid(table, row, "Min Segment Count", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "%s", tls->TcpOptions ? "Yes" : "No"); - add_string_to_table(table, row, "TCP option fields", string_buff); + add_string_to_grid(table, row, "TCP option fields", string_buff); g_snprintf(string_buff, DETAILS_STR_MAX, "%s", tls->IpOptions ? "Yes" : "No"); - add_string_to_table(table, row, "IP option fields", string_buff); + add_string_to_grid(table, row, "IP option fields", string_buff); } else { g_snprintf(string_buff, DETAILS_STR_MAX, "%u (unknown)", tls->Version); - add_string_to_table(table, row, "Version", string_buff); + add_string_to_grid(table, row, "Version", string_buff); } } break; - default: - g_snprintf(string_buff, DETAILS_STR_MAX, "Unknown task %u", of->Task); - add_string_to_table(table, row, "Task", string_buff); + default: + g_snprintf(string_buff, DETAILS_STR_MAX, "Unknown task %u", of->Task); + add_string_to_grid(table, row, "Task", string_buff); } - add_string_to_table(table, row, "", ""); + add_string_to_grid(table, row, "", ""); valuep += of->OffsetNextTask; length -= of->OffsetNextTask; - } while(of->OffsetNextTask != 0); + } while (of->OffsetNextTask != 0); } - if(TcpIpChecksumSupported == 0) { - add_string_to_table(table, row, "TCP/IP Checksum", ""); - add_string_to_table(table, row, "Offload not supported", "-"); + if (TcpIpChecksumSupported == 0) { + add_string_to_grid(table, row, "TCP/IP Checksum", ""); + add_string_to_grid(table, row, "Offload not supported", "-"); } - if(IpSecSupported == 0) { - add_string_to_table(table, row, "IpSec", ""); - add_string_to_table(table, row, "Offload not supported", "-"); + if (IpSecSupported == 0) { + add_string_to_grid(table, row, "IpSec", ""); + add_string_to_grid(table, row, "Offload not supported", "-"); } - if(TcpLargeSendSupported == 0) { - add_string_to_table(table, row, "TCP Large Send", ""); - add_string_to_table(table, row, "Offload not supported", "-"); + if (TcpLargeSendSupported == 0) { + add_string_to_grid(table, row, "TCP Large Send", ""); + add_string_to_grid(table, row, "Offload not supported", "-"); } return entries; } static int -capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter, gchar *iface) { - gchar *interface_friendly_name; +capture_if_details_general(GtkWidget *grid, GtkWidget *main_vb, guint *row, LPADAPTER adapter, gchar *iface) { + gchar *interface_friendly_name; gchar string_buff[DETAILS_STR_MAX]; - const gchar *manuf_name; + const gchar *manuf_name; unsigned int uint_value; unsigned int uint_array[50]; int uint_array_size; @@ -1789,20 +1792,20 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA int i; unsigned char values[100]; guint16 wvalues[100]; - char *utf8value; + char *utf8value; int length; unsigned short ushort_value; int entries = 0; - gchar *size_str; + gchar *size_str; /* general */ - add_string_to_table(table, row, "Characteristics", ""); + add_string_to_grid(grid, row, "Characteristics", ""); /* OS friendly name - look it up from iface ("\Device\NPF_{11111111-2222-3333-4444-555555555555}") */ interface_friendly_name = get_windows_interface_friendly_name(/* IN */ iface); - if(interface_friendly_name!=NULL){ - add_string_to_table(table, row, "OS Friendly name", interface_friendly_name); + if (interface_friendly_name != NULL){ + add_string_to_grid(grid, row, "OS Friendly name", interface_friendly_name); g_free(interface_friendly_name); } @@ -1814,7 +1817,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Vendor description", string_buff); + add_string_to_grid(grid, row, "Vendor description", string_buff); /* NDIS's "Friendly name" */ length = sizeof(wvalues); @@ -1826,69 +1829,69 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "NDIS Friendly name", string_buff); + add_string_to_grid(grid, row, "NDIS Friendly name", string_buff); /* Interface */ - add_string_to_table(table, row, "Interface", iface); + add_string_to_grid(grid, row, "Interface", iface); /* link status (connected/disconnected) */ if (wpcap_packet_request_uint(adapter, OID_GEN_MEDIA_CONNECT_STATUS, &uint_value)) { entries++; - if(uint_value == 0) { - add_string_to_table(table, row, "Link status", "Connected"); + if (uint_value == 0) { + add_string_to_grid(grid, row, "Link status", "Connected"); } else { - add_string_to_table(table, row, "Link status", "Disconnected"); + add_string_to_grid(grid, row, "Link status", "Disconnected"); } } else { - add_string_to_table(table, row, "Link status", "-"); + add_string_to_grid(grid, row, "Link status", "-"); } /* link speed */ if (wpcap_packet_request_uint(adapter, OID_GEN_LINK_SPEED, &uint_value)) { entries++; uint_value *= 100; - size_str = format_size(uint_value, format_size_unit_bits_s|format_size_prefix_si); - g_strlcpy(string_buff, size_str, DETAILS_STR_MAX); - g_free(size_str); + size_str = format_size(uint_value, format_size_unit_bits_s|format_size_prefix_si); + g_strlcpy(string_buff, size_str, DETAILS_STR_MAX); + g_free(size_str); } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Link speed", string_buff); + add_string_to_grid(grid, row, "Link speed", string_buff); uint_array_size = sizeof(uint_array); if (wpcap_packet_request(adapter, OID_GEN_MEDIA_SUPPORTED, FALSE /* !set */, (char *) uint_array, &uint_array_size)) { entries++; uint_array_size /= sizeof(unsigned int); - i=0; - while(uint_array_size--) { - add_string_to_table(table, row, "Media supported", + i = 0; + while (uint_array_size--) { + add_string_to_grid(grid, row, "Media supported", val_to_str(uint_array[i], win32_802_3_medium_vals, "(0x%x)")); i++; } } else { - add_string_to_table(table, row, "Media supported", "-"); + add_string_to_grid(grid, row, "Media supported", "-"); } uint_array_size = sizeof(uint_array); if (wpcap_packet_request(adapter, OID_GEN_MEDIA_IN_USE, FALSE /* !set */, (char *) uint_array, &uint_array_size)) { entries++; uint_array_size /= sizeof(unsigned int); - i=0; - while(uint_array_size--) { - add_string_to_table(table, row, "Medium in use", + i = 0; + while (uint_array_size--) { + add_string_to_grid(grid, row, "Medium in use", val_to_str(uint_array[i], win32_802_3_medium_vals, "(0x%x)")); i++; } } else { - add_string_to_table(table, row, "Medium in use", "-"); + add_string_to_grid(grid, row, "Medium in use", "-"); } if (wpcap_packet_request_uint(adapter, OID_GEN_PHYSICAL_MEDIUM, &physical_medium)) { entries++; - add_string_to_table(table, row, "Physical medium", + add_string_to_grid(grid, row, "Physical medium", val_to_str(physical_medium, win32_802_3_physical_medium_vals, "(0x%x)")); } else { - add_string_to_table(table, row, "Physical medium", "-"); + add_string_to_grid(grid, row, "Physical medium", "-"); } length = sizeof(ushort_value); @@ -1898,7 +1901,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "NDIS Driver Version", string_buff); + add_string_to_grid(grid, row, "NDIS Driver Version", string_buff); length = sizeof(uint_value); if (wpcap_packet_request(adapter, OID_GEN_VENDOR_DRIVER_VERSION, FALSE /* !set */, (char *) &uint_value, &length)) { @@ -1912,13 +1915,13 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Vendor Driver Version", string_buff); + add_string_to_grid(grid, row, "Vendor Driver Version", string_buff); length = sizeof(values); if (wpcap_packet_request(adapter, OID_GEN_VENDOR_ID, FALSE /* !set */, values, &length)) { entries++; manuf_name = get_manuf_name_if_known(values); - if(manuf_name != NULL) { + if (manuf_name != NULL) { g_snprintf(string_buff, DETAILS_STR_MAX, "%02X:%02X:%02X (%s) NIC: %02X", values[0], values[1], values[2], manuf_name, values[3]); } else { @@ -1928,7 +1931,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Vendor ID", string_buff); + add_string_to_grid(grid, row, "Vendor ID", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MAC_OPTIONS, &uint_value)) { entries++; @@ -1939,7 +1942,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "MAC Options", string_buff); + add_string_to_grid(grid, row, "MAC Options", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_VLAN_ID, &uint_value)) { entries++; @@ -1947,7 +1950,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "VLAN ID", string_buff); + add_string_to_grid(grid, row, "VLAN ID", string_buff); #if 0 /* value seems to be constant */ @@ -1957,7 +1960,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packet filter", string_buff); + add_string_to_grid(grid, row, "Packet filter", string_buff); #endif if (wpcap_packet_request_uint(adapter, OID_GEN_TRANSMIT_BUFFER_SPACE, &uint_value)) { @@ -1966,7 +1969,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Transmit Buffer Space", string_buff); + add_string_to_grid(grid, row, "Transmit Buffer Space", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RECEIVE_BUFFER_SPACE, &uint_value)) { entries++; @@ -1974,7 +1977,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Receive Buffer Space", string_buff); + add_string_to_grid(grid, row, "Receive Buffer Space", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_TRANSMIT_BLOCK_SIZE , &uint_value)) { entries++; @@ -1982,7 +1985,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Transmit Block Size", string_buff); + add_string_to_grid(grid, row, "Transmit Block Size", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RECEIVE_BLOCK_SIZE, &uint_value)) { entries++; @@ -1990,7 +1993,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Receive Block Size", string_buff); + add_string_to_grid(grid, row, "Receive Block Size", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MAXIMUM_TOTAL_SIZE, &uint_value)) { entries++; @@ -1998,7 +2001,7 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Maximum Packet Size", string_buff); + add_string_to_grid(grid, row, "Maximum Packet Size", string_buff); return entries; } @@ -2006,12 +2009,12 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA static int capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter) { - gchar string_buff[DETAILS_STR_MAX]; - unsigned int uint_value; - int entries = 0; + gchar string_buff[DETAILS_STR_MAX]; + unsigned int uint_value; + int entries = 0; - add_string_to_table(table, row, "Statistics", ""); + add_string_to_grid(table, row, "Statistics", ""); if (wpcap_packet_request_uint(adapter, OID_GEN_XMIT_OK, &uint_value)) { entries++; @@ -2019,7 +2022,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Transmit OK", string_buff); + add_string_to_grid(table, row, "Transmit OK", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_XMIT_ERROR, &uint_value)) { entries++; @@ -2027,7 +2030,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Transmit Error", string_buff); + add_string_to_grid(table, row, "Transmit Error", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RCV_OK, &uint_value)) { @@ -2036,7 +2039,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Receive OK", string_buff); + add_string_to_grid(table, row, "Receive OK", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RCV_ERROR, &uint_value)) { entries++; @@ -2044,7 +2047,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Receive Error", string_buff); + add_string_to_grid(table, row, "Receive Error", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RCV_NO_BUFFER, &uint_value)) { entries++; @@ -2052,7 +2055,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Receive but no Buffer", string_buff); + add_string_to_grid(table, row, "Receive but no Buffer", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_DIRECTED_BYTES_XMIT, &uint_value)) { entries++; @@ -2060,7 +2063,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Directed bytes transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Directed bytes transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_DIRECTED_FRAMES_XMIT, &uint_value)) { entries++; @@ -2068,7 +2071,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Directed packets transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Directed packets transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MULTICAST_BYTES_XMIT, &uint_value)) { entries++; @@ -2076,7 +2079,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Multicast bytes transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Multicast bytes transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MULTICAST_FRAMES_XMIT, &uint_value)) { entries++; @@ -2084,7 +2087,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Multicast packets transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Multicast packets transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_BROADCAST_BYTES_XMIT, &uint_value)) { entries++; @@ -2092,7 +2095,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Broadcast bytes transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Broadcast bytes transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_BROADCAST_FRAMES_XMIT, &uint_value)) { entries++; @@ -2100,7 +2103,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Broadcast packets transmitted w/o errors", string_buff); + add_string_to_grid(table, row, "Broadcast packets transmitted w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_DIRECTED_BYTES_RCV, &uint_value)) { entries++; @@ -2108,7 +2111,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Directed bytes received w/o errors", string_buff); + add_string_to_grid(table, row, "Directed bytes received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_DIRECTED_FRAMES_RCV, &uint_value)) { entries++; @@ -2116,7 +2119,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Directed packets received w/o errors", string_buff); + add_string_to_grid(table, row, "Directed packets received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MULTICAST_BYTES_RCV, &uint_value)) { entries++; @@ -2124,7 +2127,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Multicast bytes received w/o errors", string_buff); + add_string_to_grid(table, row, "Multicast bytes received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_MULTICAST_FRAMES_RCV, &uint_value)) { entries++; @@ -2132,7 +2135,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Multicast packets received w/o errors", string_buff); + add_string_to_grid(table, row, "Multicast packets received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_BROADCAST_BYTES_RCV, &uint_value)) { entries++; @@ -2140,7 +2143,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Broadcast bytes received w/o errors", string_buff); + add_string_to_grid(table, row, "Broadcast bytes received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_BROADCAST_FRAMES_RCV, &uint_value)) { entries++; @@ -2148,7 +2151,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Broadcast packets received w/o errors", string_buff); + add_string_to_grid(table, row, "Broadcast packets received w/o errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_RCV_CRC_ERROR, &uint_value)) { entries++; @@ -2156,7 +2159,7 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets received with CRC or FCS errors", string_buff); + add_string_to_grid(table, row, "Packets received with CRC or FCS errors", string_buff); if (wpcap_packet_request_uint(adapter, OID_GEN_TRANSMIT_QUEUE_LENGTH, &uint_value)) { entries++; @@ -2164,25 +2167,25 @@ capture_if_details_stats(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADA } else { g_snprintf(string_buff, DETAILS_STR_MAX, "-"); } - add_string_to_table(table, row, "Packets queued for transmission", string_buff); + add_string_to_grid(table, row, "Packets queued for transmission", string_buff); return entries; } static GtkWidget * -capture_if_details_page_new(GtkWidget **table) +capture_if_details_page_new(GtkWidget **grid) { GtkWidget *main_vb; main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); - /* table */ - *table = gtk_table_new(1, 2, FALSE); - gtk_table_set_col_spacings(GTK_TABLE(*table), 6); - gtk_table_set_row_spacings(GTK_TABLE(*table), 3); - gtk_box_pack_start(GTK_BOX (main_vb), *table, TRUE, TRUE, 0); + /* grid */ + *grid = ws_gtk_grid_new(); + ws_gtk_grid_set_column_spacing(GTK_GRID(*grid), 6); + ws_gtk_grid_set_row_spacing(GTK_GRID(*grid), 3); + gtk_box_pack_start(GTK_BOX (main_vb), *grid, TRUE, TRUE, 0); // review return main_vb; } @@ -2190,19 +2193,19 @@ capture_if_details_page_new(GtkWidget **table) static void capture_if_details_open_win(char *iface) { - GtkWidget *details_open_w, - *main_vb, *bbox, *close_bt, *help_bt; - GtkWidget *page_general, *page_stats, *page_802_3, *page_802_11, *page_task_offload; - GtkWidget *page_lb; - GtkWidget *table, *notebook, *label; - guint row; - LPADAPTER adapter; - int entries; + GtkWidget *details_open_w, + *main_vb, *bbox, *close_bt, *help_bt; + GtkWidget *page_general, *page_stats, *page_802_3, *page_802_11, *page_task_offload; + GtkWidget *page_lb; + GtkWidget *grid, *notebook, *label; + guint row; + LPADAPTER adapter; + int entries; /* open the network adapter */ adapter = wpcap_packet_open(iface); - if(adapter == NULL) { + if (adapter == NULL) { /* * We have an adapter that is not exposed through normal APIs (e.g. TurboCap) * or an adapter that isn't plugged in. @@ -2217,8 +2220,8 @@ capture_if_details_open_win(char *iface) } /* open a new window */ - details_open_w = dlg_window_new("Wireshark: Interface Details"); /* transient_for top_level */ - gtk_window_set_destroy_with_parent (GTK_WINDOW(details_open_w), TRUE); + details_open_w = dlg_window_new("Wireshark: Interface Details"); /* transient_for top_level */ + gtk_window_set_destroy_with_parent (GTK_WINDOW(details_open_w), TRUE); /* Container for the window contents */ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); @@ -2230,52 +2233,52 @@ capture_if_details_open_win(char *iface) gtk_box_pack_start(GTK_BOX(main_vb), notebook, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); /* General page */ - page_general = capture_if_details_page_new(&table); + page_general = capture_if_details_page_new(&grid); page_lb = gtk_label_new("Characteristics"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_general, page_lb); row = 0; - entries = capture_if_details_general(table, page_general, &row, adapter, iface); - if(entries == 0) { + entries = capture_if_details_general(grid, page_general, &row, adapter, iface); + if (entries == 0) { gtk_widget_set_sensitive(page_lb, FALSE); } /* Statistics page */ - page_stats = capture_if_details_page_new(&table); + page_stats = capture_if_details_page_new(&grid); page_lb = gtk_label_new("Statistics"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_stats, page_lb); row = 0; - entries = capture_if_details_stats(table, page_stats, &row, adapter); - if(entries == 0) { + entries = capture_if_details_stats(grid, page_stats, &row, adapter); + if (entries == 0) { gtk_widget_set_sensitive(page_lb, FALSE); } /* 802.3 (Ethernet) page */ - page_802_3 = capture_if_details_page_new(&table); + page_802_3 = capture_if_details_page_new(&grid); page_lb = gtk_label_new("802.3 (Ethernet)"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_802_3, page_lb); row = 0; - entries = capture_if_details_802_3(table, page_802_3, &row, adapter); - if(entries == 0) { + entries = capture_if_details_802_3(grid, page_802_3, &row, adapter); + if (entries == 0) { gtk_widget_set_sensitive(page_lb, FALSE); } /* 802_11 (WI-FI) page */ - page_802_11 = capture_if_details_page_new(&table); + page_802_11 = capture_if_details_page_new(&grid); page_lb = gtk_label_new("802.11 (WLAN)"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_802_11, page_lb); row = 0; - entries = capture_if_details_802_11(table, page_802_11, &row, adapter); - if(entries == 0) { + entries = capture_if_details_802_11(grid, page_802_11, &row, adapter); + if (entries == 0) { gtk_widget_set_sensitive(page_lb, FALSE); } /* Task offload page */ - page_task_offload = capture_if_details_page_new(&table); + page_task_offload = capture_if_details_page_new(&grid); page_lb = gtk_label_new("Task Offload"); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_task_offload, page_lb); row = 0; - entries = capture_if_details_task_offload(table, page_task_offload, &row, adapter); - if(entries == 0) { + entries = capture_if_details_task_offload(grid, page_task_offload, &row, adapter); + if (entries == 0) { gtk_widget_set_sensitive(page_lb, FALSE); } @@ -2303,16 +2306,17 @@ capture_if_details_open_win(char *iface) } -static void capture_if_details_open_answered_cb(gpointer dialog _U_, gint btn, gpointer data) +static void +capture_if_details_open_answered_cb(gpointer dialog _U_, gint btn, gpointer data) { - switch(btn) { - case(ESD_BTN_OK): - capture_if_details_open_win(data); - break; - case(ESD_BTN_CANCEL): - break; - default: - g_assert_not_reached(); + switch (btn) { + case(ESD_BTN_OK): + capture_if_details_open_win(data); + break; + case(ESD_BTN_CANCEL): + break; + default: + g_assert_not_reached(); } } @@ -2320,15 +2324,15 @@ static void capture_if_details_open_answered_cb(gpointer dialog _U_, gint btn, g void capture_if_details_open(char *iface) { - char *version; - gboolean version_ok = FALSE; - gpointer dialog; + char *version; + gboolean version_ok = FALSE; + gpointer dialog; /* check packet.dll version */ version = wpcap_packet_get_version(); - if(version == NULL) { + if (version == NULL) { /* couldn't even get the packet.dll version, must be a very old one or just not existing -> give up */ /* (this seems to be the case for 2.3 beta and all previous releases) */ simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, @@ -2341,27 +2345,27 @@ capture_if_details_open(char *iface) /* XXX - add more known DLL versions here */ /* (all versions since the 2.3 release seems to be working (although the 2.3 beta did not) */ - if( + if ( /* * 4.0 version strings: * 4.0.0.703: 4.0 beta 3 * 4.0.0.655: 4.0 beta 2 * 4.0.0.592: 4.0 beta 1 */ - strcmp(version, "3" ) > 0 || /* 4.0 and above (including betas) */ - strcmp(version, "3, 2, 0, 29") == 0 || /* 3.2 beta 1 */ - strcmp(version, "3, 1, 0, 27") == 0 || /* 3.1 release */ - strcmp(version, "3, 1, 0, 24") == 0 || /* 3.1 beta 4 */ - strcmp(version, "3, 1, 0, 23") == 0 || /* 3.1 beta 3 */ - strcmp(version, "3, 1, 0, 22") == 0 || /* 3.1 beta 2 */ - strcmp(version, "3, 1, 0, 20") == 0 || /* 3.1 beta */ - strcmp(version, "3.0 alpha3" ) == 0 || /* 3.0 release or 3.0 beta (yes, both versions report alpha3!) */ - strcmp(version, "2.3" ) == 0 /* 2.3 release */ + (strcmp(version, "3" ) > 0) || /* 4.0 and above (including betas) */ + (strcmp(version, "3, 2, 0, 29") == 0) || /* 3.2 beta 1 */ + (strcmp(version, "3, 1, 0, 27") == 0) || /* 3.1 release */ + (strcmp(version, "3, 1, 0, 24") == 0) || /* 3.1 beta 4 */ + (strcmp(version, "3, 1, 0, 23") == 0) || /* 3.1 beta 3 */ + (strcmp(version, "3, 1, 0, 22") == 0) || /* 3.1 beta 2 */ + (strcmp(version, "3, 1, 0, 20") == 0) || /* 3.1 beta */ + (strcmp(version, "3.0 alpha3" ) == 0) || /* 3.0 release or 3.0 beta (yes, both versions report alpha3!) */ + (strcmp(version, "2.3" ) == 0) /* 2.3 release */ ) { - version_ok = TRUE; + version_ok = TRUE; } - if(!version_ok) { + if (!version_ok) { /* packet.dll version not known to us, warn user but try to continue */ dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK | ESD_BTN_CANCEL, "%sUnknown WinPcap version might crash or fail!%s" @@ -2381,13 +2385,13 @@ capture_if_has_details(char *iface) { LPADAPTER adapter; if (!iface) { - return FALSE; + return FALSE; } adapter = wpcap_packet_open(iface); if (adapter) { - wpcap_packet_close(adapter); - return TRUE; + wpcap_packet_close(adapter); + return TRUE; } return FALSE; |