summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2009-02-13 00:17:59 +0000
committerDimitri Sokolyuk <demon@dim13.org>2009-02-13 00:17:59 +0000
commit5c4e6024a604b5dd11be09c7c6b668dca93a8078 (patch)
treec09ed2d04a1787bcd80112bfd5ad2d78cd5942e5
parentb139a006a7c386ce6aab264b07cfabc3348e7298 (diff)
fix null pointer usage, includes
-rw-r--r--Makefile4
-rw-r--r--wakeup.c20
2 files changed, 13 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index f9763c2..f7dd722 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# $Id$
PROG= wakeup
-CFLAGS+= -ggdb
+CFLAGS+= -ggdb -Wall
NOMAN=
-.include <bsd.prog.mk> \ No newline at end of file
+.include <bsd.prog.mk>
diff --git a/wakeup.c b/wakeup.c
index 5097105..16103d4 100644
--- a/wakeup.c
+++ b/wakeup.c
@@ -15,14 +15,16 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <err.h>
+#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <err.h>
+#include <unistd.h>
#define DEFAULTMAC "00:e0:c5:c4:09:f1"
#define DEFAULTNET "10.0.0.255"
@@ -32,7 +34,7 @@ int parsemac(unsigned char *, char *);
int
main(int argc, char **argv)
{
- struct hostent *he;
+// struct hostent *he;
struct sockaddr_in sin;
struct in_addr inaddr;
char *msg;
@@ -54,14 +56,14 @@ main(int argc, char **argv)
}
// he = gethostbyname(net);
inet_aton(net, &inaddr);
- memset(&sin, NULL, sizeof(sin));
+ memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
// sin.sin_addr = *((struct in_addr *) he->h_addr);
sin.sin_addr = inaddr;
sin.sin_port = htons(7);
- sockfd = socket(AF_INET, SOCK_DGRAM, NULL);
+ sockfd = socket(AF_INET, SOCK_DGRAM, 0);
setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval));
- sendto(sockfd, msg, msglen, NULL, (struct sockaddr *)&sin, sizeof(sin));
+ sendto(sockfd, msg, msglen, 0, (struct sockaddr *)&sin, sizeof(sin));
free(msg);
close(sockfd);
return 0;