From 86ba931697790d4da2515f4457ebfb3f20b43860 Mon Sep 17 00:00:00 2001 From: Epoch Qwert Date: Tue, 30 Dec 2014 07:25:39 -0600 Subject: all those .c changes were mostly fixes of warnings for the change in rebuild.sh being changed to use -Wall. gethostbyname was almost completely rewritten to work better with ipv6 for gopherd.sh gopherd.sh was rewritten to use gethostbyname instead of dig and to cut out any link-local interface indicators from the output of hop0 and to ignore an error if ipA -> hostname -> ipB causes ipA to be not the same as ipB. Don't remember if there's anything else. --- src/libexec/deddos.c | 8 +++----- src/libexec/httpd.c | 2 +- src/libexec/peerip.c | 12 +++--------- 3 files changed, 7 insertions(+), 15 deletions(-) (limited to 'src/libexec') diff --git a/src/libexec/deddos.c b/src/libexec/deddos.c index 245ba41..0af7414 100644 --- a/src/libexec/deddos.c +++ b/src/libexec/deddos.c @@ -1,4 +1,4 @@ - +#include #include #include #include @@ -13,11 +13,9 @@ int main(int argc,char *argv[]) { struct sockaddr sa; signal(SIGALRM,exit); alarm(10); - int sl=sizeof(sa); + unsigned int sl=sizeof(sa); char host[256]; char serv[256]; - char cmd[256]; - char line[256]; char iface[256]; char *name[16]; getpeername(0,&sa,&sl); @@ -49,5 +47,5 @@ int main(int argc,char *argv[]) { name[8]="UDP"; name[9]=0; execv(name[0],name); - printf("shit fucked.\n"); + return printf("shit fucked.\n"); } diff --git a/src/libexec/httpd.c b/src/libexec/httpd.c index 22d9b2b..812e051 100644 --- a/src/libexec/httpd.c +++ b/src/libexec/httpd.c @@ -4,6 +4,7 @@ #include #include #include +#include #define VHOST_ROOT "/var/www/vhosts" #define SITES_ROOT "/var/www/sites" @@ -19,7 +20,6 @@ int main(int argc,char *argv[]) { int fd; char *name[10]; int s,n; - short in; char *method; char *page; char *version; diff --git a/src/libexec/peerip.c b/src/libexec/peerip.c index 6bcf1f1..43d64d0 100644 --- a/src/libexec/peerip.c +++ b/src/libexec/peerip.c @@ -4,17 +4,11 @@ #include int main(int argc,char *argv[]) { - int i; struct sockaddr_in6 sa6; - int err; - int sl=sizeof(sa6); + unsigned int sl=sizeof(sa6); char h[NI_MAXHOST], s[NI_MAXSERV]; - if(getpeername(0,(struct sockaddr *)&sa6,&sl) == -1) { - return 1; - } - if(err=getnameinfo((struct sockaddr *)&sa6,sl,h,sizeof(h),s,sizeof(s),NI_NUMERICHOST|NI_NUMERICSERV)) { - return 2; - } + if(getpeername(0,(struct sockaddr *)&sa6,&sl) == -1) return 1; + if(getnameinfo((struct sockaddr *)&sa6,sl,h,sizeof(h),s,sizeof(s),NI_NUMERICHOST|NI_NUMERICSERV)) return 2; puts(h); puts(s); return 0; -- cgit v1.2.3