panel-plugin/net.{c,h}, panel-plugin/os.h:
- added code for DragonFly BSD, thanks to Bob Bagwill <bob@bagwill.com>
(fixed #1456)
(Old svn revision: 2247)
master
Bernhard Walle
parent
dbf646945d
commit
3ca61bba76
|
|
@ -46,7 +46,7 @@
|
||||||
#elif __APPLE__
|
#elif __APPLE__
|
||||||
# include "src/macos.h"
|
# include "src/macos.h"
|
||||||
# include "src/macos.c"
|
# include "src/macos.c"
|
||||||
#elif __FreeBSD__
|
#elif __FreeBSD__ || __DragonFly__
|
||||||
# include "wormulon/freebsd.h"
|
# include "wormulon/freebsd.h"
|
||||||
# include "wormulon/freebsd.c"
|
# include "wormulon/freebsd.c"
|
||||||
#elif __linux__
|
#elif __linux__
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ typedef struct
|
||||||
#ifdef __HPUX__
|
#ifdef __HPUX__
|
||||||
int wait_pcks_counter;
|
int wait_pcks_counter;
|
||||||
nmapi_logstat* if_ptr;
|
nmapi_logstat* if_ptr;
|
||||||
#elif __FreeBSD__
|
#elif __FreeBSD__ || __DragonFly__
|
||||||
int watchif;
|
int watchif;
|
||||||
int dev_opened;
|
int dev_opened;
|
||||||
#elif __NetBSD__
|
#elif __NetBSD__
|
||||||
|
|
|
||||||
|
|
@ -19,186 +19,210 @@
|
||||||
#define _OS_H
|
#define _OS_H
|
||||||
|
|
||||||
#if defined (__sun__)
|
#if defined (__sun__)
|
||||||
#define __Solaris__ 1
|
# define __Solaris__ 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __HPUX__ /* H P U X */
|
#ifdef __HPUX__ /* H P U X */
|
||||||
#define _XOPEN_SOURCE_EXTENDED
|
# define _XOPEN_SOURCE_EXTENDED
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <stropts.h>
|
# include <stropts.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/stdsyms.h>
|
# include <sys/stdsyms.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <sys/mib.h>
|
# include <sys/mib.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#elif __APPLE__ /* Mac OS X */
|
#elif __APPLE__ /* Mac OS X */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <curses.h>
|
# include <curses.h>
|
||||||
#include <ifaddrs.h>
|
# include <ifaddrs.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/route.h>
|
# include <net/route.h>
|
||||||
#include <net/if_dl.h>
|
# include <net/if_dl.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <net/if_media.h>
|
# include <net/if_media.h>
|
||||||
#include <net/if_mib.h>
|
# include <net/if_mib.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
|
#elif __DragonFly__ /* D R A G O N F L Y */
|
||||||
|
# include <stdio.h>
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stdarg.h>
|
||||||
|
# include <unistd.h>
|
||||||
|
# include <string.h>
|
||||||
|
# include <time.h>
|
||||||
|
# include <ctype.h>
|
||||||
|
# include <signal.h>
|
||||||
|
# include <sys/param.h>
|
||||||
|
# include <sys/sysctl.h>
|
||||||
|
# include <sys/wait.h>
|
||||||
|
# include <sys/stat.h>
|
||||||
|
# include <sys/ioctl.h>
|
||||||
|
# include <sys/types.h>
|
||||||
|
# include <sys/socket.h>
|
||||||
|
# include <sys/time.h>
|
||||||
|
# include <netinet/in.h>
|
||||||
|
# include <net/if.h>
|
||||||
|
# include <net/if_media.h>
|
||||||
|
# include <net/if_mib.h>
|
||||||
|
# include <arpa/inet.h>
|
||||||
|
# include <net/ppp_layer/ppp_defs.h>
|
||||||
|
# include <net/ppp/if_ppp.h>
|
||||||
#elif __FreeBSD__ /* F R E E B S D */
|
#elif __FreeBSD__ /* F R E E B S D */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <net/if_media.h>
|
# include <net/if_media.h>
|
||||||
#include <net/if_mib.h>
|
# include <net/if_mib.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/ppp_defs.h>
|
# include <net/ppp_defs.h>
|
||||||
#include <net/if_ppp.h>
|
# include <net/if_ppp.h>
|
||||||
#elif __NetBSD__ /* N E T B S D */
|
#elif __NetBSD__ /* N E T B S D */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <net/if_media.h>
|
# include <net/if_media.h>
|
||||||
#include <net/route.h>
|
# include <net/route.h>
|
||||||
#include <net/if_dl.h>
|
# include <net/if_dl.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/ppp_defs.h>
|
# include <net/ppp_defs.h>
|
||||||
#include <net/if_ppp.h>
|
# include <net/if_ppp.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#elif __OpenBSD__ || __MicroBSD__ /* O P E N B S D */
|
#elif __OpenBSD__ || __MicroBSD__ /* O P E N B S D */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <net/if_media.h>
|
# include <net/if_media.h>
|
||||||
#include <net/if_dl.h>
|
# include <net/if_dl.h>
|
||||||
#include <net/route.h>
|
# include <net/route.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/ppp_defs.h>
|
# include <net/ppp_defs.h>
|
||||||
#include <net/if_ppp.h>
|
# include <net/if_ppp.h>
|
||||||
#elif __linux__ /* L I N U X */
|
#elif __linux__ /* L I N U X */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/ppp_defs.h>
|
# include <net/ppp_defs.h>
|
||||||
#include <net/if_ppp.h>
|
# include <net/if_ppp.h>
|
||||||
#elif __Solaris__ /* S O L A R I S */
|
#elif __Solaris__ /* S O L A R I S */
|
||||||
#include <stdio.h>
|
# include <stdio.h>
|
||||||
#define _WIDEC_H
|
# define _WIDEC_H
|
||||||
#include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <stdarg.h>
|
# include <stdarg.h>
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#include <string.h>
|
# include <string.h>
|
||||||
#include <time.h>
|
# include <time.h>
|
||||||
#include <ctype.h>
|
# include <ctype.h>
|
||||||
#include <signal.h>
|
# include <signal.h>
|
||||||
#include <sys/wait.h>
|
# include <sys/wait.h>
|
||||||
#include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <stropts.h>
|
# include <stropts.h>
|
||||||
#include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#include <sys/sockio.h>
|
# include <sys/sockio.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <kstat.h>
|
# include <kstat.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#include <sys/sockio.h>
|
# include <sys/sockio.h>
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#include <net/if.h>
|
# include <net/if.h>
|
||||||
#else
|
#else
|
||||||
#error "OS not supported"
|
# error "OS not supported"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue