StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

removed debugging

Browse Source
This commit is contained in:
charmlesscoin 2013-08-01 16:54:04 -04:00
parent 939c4afd2c
commit 4a5bc1f0fe
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/LAN_discovery.c
View File

@ -24,26 +24,28 @@
#include "LAN_discovery.h" #include "LAN_discovery.h"
#define MAX_INTERFACES 16 #define MAX_INTERFACES 16
#define ERR_IOCTL 0
#ifdef __linux #ifdef __linux
/* get the first working broadcast address that's not from "lo" /* get the first working broadcast address that's not from "lo"
* returns higher than 0 on success * returns higher than 0 on success
* returns ERR_IOCTL on error */ * returns 0 on error */
uint32_t get_broadcast(void) uint32_t get_broadcast(void)
{ {
/* not sure how many platforms this will /* not sure how many platforms this will
* run on, so it's wrapped in __linux for now */ * run on, so it's wrapped in __linux for now */
struct sockaddr_in *sock_holder = NULL; struct sockaddr_in *sock_holder = NULL;
struct ifreq i_faces[MAX_INTERFACES]; struct ifreq i_faces[MAX_INTERFACES];
struct in_addr result;
struct ifconf ifconf; struct ifconf ifconf;
int count = 0; int count = 0;
int sock = 0; int sock = 0;
int i = 0; int i = 0;
/* configure ifconf for the ioctl call */ /* configure ifconf for the ioctl call */
sock = socket(AF_INET, SOCK_STREAM, 0); if((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
perror("[!] get_broadcast: socket() error");
return 0;
}
memset(i_faces, 0, sizeof(struct ifreq) * MAX_INTERFACES); memset(i_faces, 0, sizeof(struct ifreq) * MAX_INTERFACES);
ifconf.ifc_buf = (char *)i_faces; ifconf.ifc_buf = (char *)i_faces;
@ -51,16 +53,15 @@ uint32_t get_broadcast(void)
count = ifconf.ifc_len / sizeof(struct ifreq); count = ifconf.ifc_len / sizeof(struct ifreq);
if(ioctl(sock, SIOCGIFCONF, &ifconf) < 0) { if(ioctl(sock, SIOCGIFCONF, &ifconf) < 0) {
perror("get_broadcast: ioctl() error"); perror("get_broadcast: ioctl() error");
return ERR_IOCTL; return 0;
} }
fprintf(stderr, "count: %d\n", count);
for(i = 0; i < count; i++) { for(i = 0; i < count; i++) {
/* skip the loopback interface, as it's useless */ /* skip the loopback interface, as it's useless */
if(strcmp(i_faces[i].ifr_name, "lo") != 0) { if(strcmp(i_faces[i].ifr_name, "lo") != 0) {
if(ioctl(sock, SIOCGIFBRDADDR, &i_faces[i]) < 0) { if(ioctl(sock, SIOCGIFBRDADDR, &i_faces[i]) < 0) {
perror("[!] get_broadcast: ioctl error"); perror("[!] get_broadcast: ioctl error");
return ERR_IOCTL; return 0;
} }
/* just to clarify where we're getting the values from */ /* just to clarify where we're getting the values from */
@ -70,13 +71,6 @@ uint32_t get_broadcast(void)
} }
close(sock); close(sock);
char test[INET_ADDRSTRLEN];
result.s_addr = sock_holder->sin_addr.s_addr;
inet_ntop(AF_INET, &result, test, INET_ADDRSTRLEN);
fprintf(stderr, "broadcast address for %s: %s\n", i_faces[i].ifr_name, test);
getchar();
return sock_holder->sin_addr.s_addr; return sock_holder->sin_addr.s_addr;
} }
#endif #endif
@ -87,8 +81,8 @@ IP broadcast_ip()
IP ip; IP ip;
#ifdef __linux #ifdef __linux
ip.i = get_broadcast(); ip.i = get_broadcast();
if(ip.i == ERR_IOCTL) if(ip.i == 0)
/* ioctl errored, but try anyway? */ /* error errored, but try anyway? */
ip.i = ~0; ip.i = ~0;
#else #else
ip.i = ~0; ip.i = ~0;