Sender can now also send streams to an IP that requests it. Useful for fallback UDP mode.

Author: Spritetm

server/main.c

@@ -32,8 +32,7 @@ struct TcpClient {
 	TcpClient *next;
 };
 
-TcpClient *clients;
-
+TcpClient *clients=NULL;
 
 int cycleLenMs=60000; //cycle defaults to 1 min
 struct timeval cycleStart;
@@ -52,8 +51,13 @@ int cycleRemainingMs() {
 }
 
 
-int createSocket(int port) {
-	int fd=socket(AF_INET, SOCK_STREAM, 0);
+int createSocket(int port, int isUdp) {
+	int fd;
+	if (!isUdp) {
+		fd=socket(AF_INET, SOCK_STREAM, 0);
+	} else {
+		fd=socket(AF_INET, SOCK_DGRAM, 0);
+	}
 	if (fd<=0) {
 		perror("creating socket");
 		exit(1);
@@ -72,11 +76,12 @@ int createSocket(int port) {
 		exit(1);
 	}
 
-	if (listen(fd, 8)<0) {
-		perror("listen");
-		exit(1);
+	if (!isUdp) {
+		if (listen(fd, 8)<0) {
+			perror("listen");
+			exit(1);
+		}
 	}
-
 	return fd;
 }
 
@@ -189,12 +194,10 @@ static void handleClient(TcpClient *cl) {
 
 
 int main(int argc, char **argv) {
-	int listenFd;
+	int listenFd, udpFd;
 	senderInit();
-	if (argc==1) {
-		senderAddDest("192.168.5.255");
-	} else {
-		senderAddDest(argv[1]);
+	for (int i=1; i<argc; i++) {
+		senderAddDest(argv[i], 0);
 	}
 
 #ifndef SIMULATE_PACKET_LOSS
@@ -207,7 +210,8 @@ int main(int argc, char **argv) {
 	serdesInit(fecSend, fecGetMaxPacketLength());
 	hlmuxInit(serdesSend, serdesGetMaxPacketLength());
 
-	listenFd=createSocket(2017);
+	listenFd=createSocket(2017, 0);
+	udpFd=createSocket(2017, 1);
 
 	newCycle();
 	while(1) {
@@ -216,7 +220,9 @@ int main(int argc, char **argv) {
 		struct timeval tout;
 		FD_ZERO(&rfds);
 		FD_SET(listenFd, &rfds);
+		FD_SET(udpFd, &rfds);
 		max=listenFd;
+		if (max<udpFd) max=udpFd;
 		for (TcpClient *i=clients; i!=NULL; i=i->next) {
 			FD_SET(i->fd, &rfds);
 			if (max<i->fd) max=i->fd;
@@ -255,6 +261,16 @@ int main(int argc, char **argv) {
 			clients=newc;
 			printf("Accepted client\n");
 		}
+		if (FD_ISSET(udpFd, &rfds)) {
+			char buf[16];
+			struct sockaddr src;
+			int l;
+			socklen_t srclen;
+			l=recvfrom(udpFd, buf, sizeof(buf), 0, &src, &srclen);
+			if (l>0 && buf[0]=='C') {
+				senderAddDestSockaddr(&src, srclen, 10*60);
+			}
+		}
 
 		for (TcpClient *i=clients; i!=NULL; i=i->next) {
 			if (FD_ISSET(i->fd, &rfds)) {

server/sender.c

@@ -9,13 +9,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 typedef struct SenderDstItem SenderDstItem;
 
 struct SenderDstItem{
-	char *name;
 	struct sockaddr *addr;
 	socklen_t addrlen;
+	time_t timeout;
 	SenderDstItem *next;
 };
 
@@ -41,10 +42,34 @@ int senderInit() {
 #define str(a) str2(a)
 #define str2(a) #a
 
-int senderAddDest(char *hostname) {
+int senderAddDestSockaddr(struct sockaddr *addr, socklen_t addrlen, int timeout) {
+	SenderDstItem *dest;
+	for (dest=senderDest; dest!=NULL; dest=dest->next) {
+		if (dest->addrlen==addrlen && memcmp(dest->addr, addr, addrlen)==0) break;
+	}
+	if (dest!=NULL) {
+		//Just modify timeout.
+		dest->timeout=time(NULL)+timeout;
+	} else {
+		//Allocate new dest struct, and everything in it
+		dest=malloc(sizeof(SenderDstItem));
+		memset(dest, 0, sizeof(SenderDstItem));
+		dest->addr=malloc(addrlen);
+		//Copy over info
+		memcpy(dest->addr, addr, addrlen);
+		dest->addrlen=addrlen;
+		dest->timeout=time(NULL)+timeout;
+		//Add into linked list
+		dest->next=senderDest;
+		senderDest=dest;
+	}
+	return 1;
+}
+
+
+int senderAddDest(char *hostname, int timeout) {
 	const char* portname="2017";
 	struct addrinfo hints;
-	SenderDstItem *dest;
 	memset(&hints,0,sizeof(hints));
 	//Grab address info for hostname
 	hints.ai_family=AF_UNSPEC;
@@ -58,21 +83,7 @@ int senderAddDest(char *hostname) {
 		perror(hostname);
 		return 0;
 	}
-	//Allocate new dest struct, and everything in it
-	dest=malloc(sizeof(SenderDstItem));
-	memset(dest, 0, sizeof(SenderDstItem));
-	dest->addr=malloc(res->ai_addrlen);
-	dest->name=malloc(strlen(hostname)+1);
-	//Copy over info
-	strcpy(dest->name, hostname);
-	memcpy(dest->addr, res->ai_addr, res->ai_addrlen);
-	dest->addrlen=res->ai_addrlen;
-	//Add into linked list
-	dest->next=senderDest;
-	senderDest=dest;
-	//All done.
-	freeaddrinfo(res);
-	return 1;
+	return senderAddDestSockaddr(res->ai_addr, res->ai_addrlen, timeout);
 }
 
 #define PAD_LENGTH 0
@@ -89,11 +100,31 @@ void senderSendPkt(uint8_t *packet, size_t len) {
 //		printf("Sending 0x%X bytes\n", len);
 		r=sendto(senderFd, ppacket, len, 0, dst->addr, dst->addrlen);
 		if (r==-1) {
-			perror(dst->name);
+			dst->timeout=1; //instantly remove next
 		}
 		dst=dst->next;
 	}
 	free(ppacket);
+
+	//Housekeeping: see if there are dests that need to be killed
+	int notDone=1;
+	do {
+		SenderDstItem *dest, *pdest=NULL;
+		for (dest=senderDest; dest!=NULL; dest=dest->next) {
+			if (dest->timeout!=0 && dest->timeout<time(NULL)) break;
+			pdest=dest;
+		}
+		if (dest) {
+			if (pdest) {
+				pdest->next=dest->next;
+			} else {
+				senderDest=dest->next;
+			}
+			free(dest);
+		} else {
+			notDone=0;
+		}
+	} while (notDone);
 }
 
 

server/sender.h

@@ -4,7 +4,8 @@
 #include "sendif.h"
 
 int senderInit();
-int senderAddDest(char *hostname);
+int senderAddDest(char *hostname, int timeout);
+int senderAddDestSockaddr(struct sockaddr *addr, socklen_t addrlen, int timeout);
 void senderSendPkt(uint8_t *packet, size_t len);
 int senderGetMaxPacketLength();