mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 16:41:11 +02:00
Address some windows compile warnings
This commit is contained in:
parent
a0c2af5f78
commit
5942726685
|
@ -50,8 +50,7 @@ static void iterate_win_network_adapters(
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
HKEY key, key2;
|
HKEY key, key2;
|
||||||
char regpath[1024];
|
char regpath[1024];
|
||||||
long len, rc;
|
int rc;
|
||||||
int found = 0;
|
|
||||||
int err, i;
|
int err, i;
|
||||||
struct win_adapter_info adapter;
|
struct win_adapter_info adapter;
|
||||||
|
|
||||||
|
@ -66,7 +65,7 @@ static void iterate_win_network_adapters(
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; ; i++) {
|
for (i = 0; ; i++) {
|
||||||
len = sizeof(adapter.adapterid);
|
long unsigned int len = sizeof(adapter.adapterid);
|
||||||
if(RegEnumKeyEx(key, i, (LPTSTR)adapter.adapterid, &len, 0, 0, 0, NULL))
|
if(RegEnumKeyEx(key, i, (LPTSTR)adapter.adapterid, &len, 0, 0, 0, NULL))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -77,7 +76,7 @@ static void iterate_win_network_adapters(
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
len = sizeof(adapter.adaptername);
|
len = sizeof(adapter.adaptername);
|
||||||
err = RegQueryValueEx(key2, "Name", 0, 0, adapter.adaptername, &len);
|
err = RegQueryValueEx(key2, "Name", 0, 0, (unsigned char *)adapter.adaptername, &len);
|
||||||
|
|
||||||
RegCloseKey(key2);
|
RegCloseKey(key2);
|
||||||
|
|
||||||
|
@ -117,7 +116,7 @@ void win_print_available_adapters() {
|
||||||
|
|
||||||
static int lookup_adapter_info_reg(const char *target_adapter, char *regpath, size_t regpath_size) {
|
static int lookup_adapter_info_reg(const char *target_adapter, char *regpath, size_t regpath_size) {
|
||||||
HKEY key, key2;
|
HKEY key, key2;
|
||||||
long len, rc;
|
int rc;
|
||||||
char index[16];
|
char index[16];
|
||||||
int err, i;
|
int err, i;
|
||||||
devstr_t adapter_name;
|
devstr_t adapter_name;
|
||||||
|
@ -129,7 +128,7 @@ static int lookup_adapter_info_reg(const char *target_adapter, char *regpath, si
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; ; i++) {
|
for(i = 0; ; i++) {
|
||||||
len = sizeof(index);
|
long unsigned int len = sizeof(index);
|
||||||
if(RegEnumKeyEx(key, i, (LPTSTR)index, &len, 0, 0, 0, NULL))
|
if(RegEnumKeyEx(key, i, (LPTSTR)index, &len, 0, 0, 0, NULL))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -138,7 +137,7 @@ static int lookup_adapter_info_reg(const char *target_adapter, char *regpath, si
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
len = sizeof(adapter_name);
|
len = sizeof(adapter_name);
|
||||||
err = RegQueryValueEx(key2, "NetCfgInstanceId", 0, 0, adapter_name, &len);
|
err = RegQueryValueEx(key2, "NetCfgInstanceId", 0, 0, (unsigned char *)adapter_name, &len);
|
||||||
|
|
||||||
RegCloseKey(key2);
|
RegCloseKey(key2);
|
||||||
|
|
||||||
|
@ -162,9 +161,6 @@ static void set_interface_mac(struct tuntap_dev *device, const char *mac_str) {
|
||||||
char mac_buf[18];
|
char mac_buf[18];
|
||||||
char adapter_info_reg[1024];
|
char adapter_info_reg[1024];
|
||||||
|
|
||||||
uint64_t mac = 0;
|
|
||||||
uint8_t *ptr = (uint8_t*)&mac;
|
|
||||||
|
|
||||||
if(strlen(mac_str) != 17) {
|
if(strlen(mac_str) != 17) {
|
||||||
printf("Invalid MAC: %s\n", mac_str);
|
printf("Invalid MAC: %s\n", mac_str);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
|
@ -387,7 +383,8 @@ int open_wintap(struct tuntap_dev *device,
|
||||||
|
|
||||||
int tuntap_read(struct tuntap_dev *tuntap, unsigned char *buf, int len)
|
int tuntap_read(struct tuntap_dev *tuntap, unsigned char *buf, int len)
|
||||||
{
|
{
|
||||||
DWORD read_size, last_err;
|
DWORD read_size;
|
||||||
|
int last_err;
|
||||||
|
|
||||||
ResetEvent(tuntap->overlap_read.hEvent);
|
ResetEvent(tuntap->overlap_read.hEvent);
|
||||||
if (ReadFile(tuntap->device_handle, buf, len, &read_size, &tuntap->overlap_read)) {
|
if (ReadFile(tuntap->device_handle, buf, len, &read_size, &tuntap->overlap_read)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user