ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add hack to have an understandable device name on 

!WINDOWS (at least linux :) and print the selected
device name on log level 2.
This commit is contained in:
riccardom 2010-04-20 17:10:35 +00:00
parent 5f98f3906e
commit 4c0e2761e8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/wifi.cpp
View File

@ -34,6 +34,7 @@
#ifndef WXPORT #ifndef WXPORT
#include "windriver.h" #include "windriver.h"
#endif #endif
#define PCAP_DEVICE_NAME description
#else #else
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -43,6 +44,7 @@
#define socket_t int #define socket_t int
#define sockaddr_t struct sockaddr #define sockaddr_t struct sockaddr
#define closesocket close #define closesocket close
#define PCAP_DEVICE_NAME name
#endif #endif
#ifndef INVALID_SOCKET #ifndef INVALID_SOCKET
@ -1927,6 +1929,8 @@ static pcap_if_t * WIFI_index_device(pcap_if_t *alldevs, int index)
for(int i = 0; i < index; i++) for(int i = 0; i < index; i++)
curr = curr->next; curr = curr->next;
WIFI_LOG(2, "SoftAP: using %s as device.\n", curr->PCAP_DEVICE_NAME);
return curr; return curr;
} }
@ -1963,7 +1967,7 @@ bool SoftAP_Init()
wifi_bridge = driver->PCAP_open(dev->name, PACKET_SIZE, PCAP_OPENFLAG_PROMISCUOUS, 1, errbuf); wifi_bridge = driver->PCAP_open(dev->name, PACKET_SIZE, PCAP_OPENFLAG_PROMISCUOUS, 1, errbuf);
if(wifi_bridge == NULL) if(wifi_bridge == NULL)
{ {
WIFI_LOG(1, "SoftAP: PCap: failed to open %s: %s\n", (dev->description ? dev->description : "the network adapter"), errbuf); WIFI_LOG(1, "SoftAP: PCap: failed to open %s: %s\n", dev->PCAP_DEVICE_NAME, errbuf);
return false; return false;
} }