remove OpenWRT-specific Makefile; move src/ to /

4 files changed, 0 insertions, 197 deletions

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 6e3d3db..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: broadcaster listener
-
-.PHONY: clean
-clean:
-	rm -f broadcaster listener *~
diff --git a/src/broadcaster.c b/src/broadcaster.c
deleted file mode 100644
index 66d6b58..0000000
--- a/src/broadcaster.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-** broadcaster.c -- a datagram "client" like talker.c, except
-**                  this one can broadcast
-*/
-
-#include "common.h"
-
-int main(int argc, char **argv)
-{
-    int fd;
-    struct sockaddr_in6 addr;
-    int broadcast = 1;
-
-    /* assemble packet, parse cmd line */
-    if (argc < 3 || argc > 4) {
-      fprintf(stderr, "usage: %s interface task [message|-]\n", argv[0]);
-      exit(1);
-    }
-    char buf[MAXBUFLEN],
-      *task = argv[2],
-      *message = (argc == 4) ? argv[3] : "";
-    int task_len = strlen(task),
-      total_len = task_len + 1;
-    strcpy(buf, task);
-    buf[task_len] = 0;
-    if (strcmp(message, "-") == 0) {
-      /* read payload from stdin */
-      int i;
-      while ((MAXBUFLEN - total_len - 1 > 0)
-	     && ((i = read(0, &(buf[total_len]), MAXBUFLEN - total_len - 1)) > 0))
-	total_len += i;
-      ENP(i, "read(stdin)");
-      if (read(0, &i, 1) != 0) {
-	fprintf(stderr, "payload to long: max %d bytes\n", MAXBUFLEN - 1);
-	exit(1);
-      }
-    }else{
-      /* use cmd line for payload */
-      total_len += strlen(message);
-      if (total_len <= MAXBUFLEN)
-	strcpy(buf + 1 + task_len, message);
-    }
-    if (total_len > MAXBUFLEN) {
-      fprintf(stderr,"payload to long: max %d bytes, was %d\n",
-	      MAXBUFLEN - 1, total_len);
-      exit(1);
-    }
-
-    /* setup socket */
-    ENP((fd = socket(AF_INET6, SOCK_DGRAM, 0)), "socket");
-    addr.sin6_family = AF_INET6;
-    addr.sin6_port = htons(SERVERPORT);
-    addr.sin6_flowinfo = 0;
-    inet_pton(AF_INET6, "ff02::1", &(addr.sin6_addr));
-    if ((addr.sin6_scope_id = if_nametoindex(argv[1])) == 0) {
-      fprintf(stderr, "interface not found\n");
-      exit(1);
-    }
-
-    /* send packet */
-    ENP(sendto(fd, buf, total_len, 0, (struct sockaddr *) &addr, sizeof addr), 
-	"sendto");
-
-    return 0;
-}
diff --git a/src/common.h b/src/common.h
deleted file mode 100644
index 5ce3c61..0000000
--- a/src/common.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef UDP_BROADCAST_COMMON
-#define UDP_BROADCAST_COMMON
-
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-
-/* the port users will be connecting to */
-#define SERVERPORT 4950
-#define SERVERPORT_S "4950"
-
-/* RFC 2460 requires IPv6 link MTU >= 1280, IPv6 UDP headers sum up to
-   48 byte, the rest is for us. One extra byte is for the final \0
-   (not transmitted) */
-#define MAXBUFLEN 1233
-
-#define ENP(Cmd, Msg) \
-  if ((Cmd) == -1) {		\
-    perror(Msg);		\
-    exit(1);			\
-  }
-
-#endif // UDP_BROADCAST_COMMON
diff --git a/src/listener.c b/src/listener.c
deleted file mode 100644
index e24cf55..0000000
--- a/src/listener.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-** listener.c -- a datagram sockets "server" demo
-*/
-
-#include "common.h"
-
-int main(int argc, char **argv, char **envp) {
-  int fd;
-  int numbytes;
-  struct sockaddr_storage their_addr;
-  char buf[MAXBUFLEN];
-  socklen_t addr_len;
-
-  /* setup socket, parse cmd line */
-  {
-    struct sockaddr_in6 ba;
-    struct ipv6_mreq ga;
-    if (argc > 2) {
-      fprintf(stderr, "usage: %s [interface]\n", argv[0]);
-      exit(1);
-    }
-    ENP((fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)), "listener: socket");
-    if (argc == 2) {
-      inet_pton(AF_INET6, "ff02::1", &(ba.sin6_addr));
-      if ((ba.sin6_scope_id = if_nametoindex(argv[1])) == 0) {
-	fprintf(stderr, "interface not found\n");
-	exit(1);
-      }
-    }else{
-      ba.sin6_addr = in6addr_any;
-      ba.sin6_scope_id = 0;
-    }
-    ba.sin6_family = AF_INET6;
-    ba.sin6_port = htons(SERVERPORT);
-    ba.sin6_flowinfo = 0;
-    ENP(bind(fd, (struct sockaddr*) &ba, sizeof ba), "listener: bind");
-  }
-
-  /* daemonize */
-#ifndef DEBUG
-  switch (fork()) {
-  case 0:
-    ENP(setsid(), "setsid");
-    umask(0);
-    break;
-  case -1:
-    perror("fork");
-    exit(1);
-  default:
-    exit(0);
-  }
-#endif
-    
-  /* receive loop */
-  addr_len = sizeof their_addr;
-  while ((numbytes = recvfrom(fd, buf, MAXBUFLEN-1 , 0,
-			      (struct sockaddr *) &their_addr, &addr_len)) != -1) {
-    /* decode packet & launch handler */
-    buf[numbytes] = '\0';
-    char *task = buf,
-      *cl_argv[2] = {task, NULL};
-    if (task[0] == '/' || strstr(task, "..")) {
-      fprintf(stderr, "payload tried directory traversal\n");
-      continue;
-    }
-
-    int fd_payload[2];
-    ENP(pipe(fd_payload), "pipe");
-      
-    switch (fork()) {
-    case 0:
-      /* redirect payload to stdio, leave stdout/err, close the rest */
-      ENP(dup2(fd_payload[0], 0), "dup");
-      ENP(close(fd_payload[0]),  "close");
-      ENP(close(fd_payload[1]),  "close");
-      ENP(close(fd),             "close");
-
-      /* run our task task */
-      execve(task, cl_argv, envp);
-      perror("exec");
-      exit(1);
-    case -1:
-      perror("fork");
-      exit(1);
-    }
-
-    /* write payload to child process; the return value of write is
-       intentionally ignored */
-    int tasklen = strlen(task);
-    if (tasklen < numbytes)
-      write(fd_payload[1], buf + tasklen + 1, numbytes - tasklen - 1);
-    ENP(close(fd_payload[1]), "close");
-    ENP(close(fd_payload[0]), "close");
-    ENP(wait(NULL), "wait");
-  }
-    
-  perror("recvfrom");
-  return 1;
-}