X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/b830a899ca4587707123482c5dbb8c14edb8fd9c..e843431b6078e2fbfd8782f65f2cd2beadbdb0cc:/util.c?ds=sidebyside

diff --git a/util.c b/util.c
index 0ba92ec..e412fc1 100644
--- a/util.c
+++ b/util.c
@@ -1,7 +1,5 @@
 /* Misc util functions */
 
-char const *cvs_id_util = "$Id: util.c,v 1.11 2005-06-04 15:42:36 bodea Exp $";
-
 #include <unistd.h>
 #include <errno.h>
 #include <sched.h>
@@ -10,6 +8,7 @@ char const *cvs_id_util = "$Id: util.c,v 1.11 2005-06-04 15:42:36 bodea Exp $";
 #include <arpa/inet.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <linux/rtnetlink.h>
 
 #include "l2tpns.h"
 #ifdef BGP
@@ -20,28 +19,43 @@ char const *cvs_id_util = "$Id: util.c,v 1.11 2005-06-04 15:42:36 bodea Exp $";
 // to use
 char *fmtaddr(in_addr_t addr, int n)
 {
-	static char addrs[4][16];
-	struct in_addr in;
+    static char addrs[4][16];
+    struct in_addr in;
+
+    if (n < 0 || n >= 4)
+	return "";
+
+    in.s_addr = addr;
+    return strcpy(addrs[n], inet_ntoa(in));
+}
+
+char *fmtMacAddr(uint8_t *pMacAddr)
+{
+	static char strMAC[2*ETH_ALEN];
 
-	if (n < 0 || n >= 4) return "";
-	in.s_addr = addr;
-	return strcpy(addrs[n], inet_ntoa(in));
+	sprintf(strMAC, "%02X:%02X:%02X:%02X:%02X:%02X",
+			pMacAddr[0], pMacAddr[1], pMacAddr[2],
+			pMacAddr[3], pMacAddr[4], pMacAddr[5]);
+
+  return strMAC;
 }
 
 void *shared_malloc(unsigned int size)
 {
-	void * p;
-	p = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+    void * p;
+    p = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 
-	if (p == MAP_FAILED)
-		p = NULL;
+    if (p == MAP_FAILED)
+	p = NULL;
 
-	return p;
+    return p;
 }
 
 extern int forked;
-extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, ifr6fd, rand_fd, cluster_sockfd;
+extern int cluster_sockfd, tunfd, controlfd, daefd, snoopfd, ifrfd, ifr6fd, rand_fd;
+extern int pppoediscfd, pppoesessfd;
 extern int *radfds;
+extern int udpfd[MAX_UDPFD + 1];
 
 pid_t fork_and_close()
 {
@@ -69,28 +83,110 @@ pid_t fork_and_close()
 	signal(SIGUSR1, SIG_DFL);
 	signal(SIGQUIT, SIG_DFL);
 	signal(SIGKILL, SIG_DFL);
-	signal(SIGALRM, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 
 	// Close sockets
-	if (tunfd != -1)          close(tunfd);
-	if (udpfd != -1)          close(udpfd);
-	if (controlfd != -1)      close(controlfd);
-	if (snoopfd != -1)        close(snoopfd);
-	if (ifrfd != -1)          close(ifrfd);
-	if (ifr6fd != -1)         close(ifr6fd);
-	if (rand_fd != -1)        close(rand_fd);
-	if (cluster_sockfd != -1) close(cluster_sockfd);
-	if (clifd != -1)          close(clifd);
-	if (epollfd != -1)        close(epollfd);
+	if (clifd != -1)	close(clifd);
+	if (cluster_sockfd != -1)	close(cluster_sockfd);
+	if (tunfd != -1)	close(tunfd);
+
+	for (i = 0; i < config->nbudpfd; i++)
+	{
+		if (udpfd[i] != -1)	close(udpfd[i]);
+	}
+
+	if (pppoediscfd != -1)	close(pppoediscfd);
+	if (pppoediscfd != -1)	close(pppoediscfd);
+	if (controlfd != -1)	close(controlfd);
+	if (daefd != -1)	close(daefd);
+	if (snoopfd != -1)	close(snoopfd);
+	if (rand_fd != -1)	close(rand_fd);
+	if (epollfd != -1)	close(epollfd);
 
 	for (i = 0; radfds && i < RADIUS_FDS; i++)
 		close(radfds[i]);
+
 #ifdef BGP
 	for (i = 0; i < BGP_NUM_PEERS; i++)
 		if (bgp_peers[i].sock != -1)
 			close(bgp_peers[i].sock);
 #endif /* BGP */
 
-	return pid;
+    return pid;
+}
+
+ssize_t recvfromto(int s, void *buf, size_t len, int flags,
+	struct sockaddr *from, socklen_t *fromlen, struct in_addr *toaddr)
+{
+	ssize_t r;
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	struct iovec vec;
+	char cbuf[128];
+
+	memset(&msg, 0, sizeof(msg));
+	msg.msg_name = from;
+	msg.msg_namelen = *fromlen;
+
+	vec.iov_base = buf;
+	vec.iov_len = len;
+	msg.msg_iov = &vec;
+	msg.msg_iovlen = 1;
+	msg.msg_flags = 0;
+
+	msg.msg_control = cbuf;
+	msg.msg_controllen = sizeof(cbuf);
+
+	if ((r = recvmsg(s, &msg, flags)) < 0)
+		return r;
+
+	if (fromlen)
+		*fromlen = msg.msg_namelen;
+
+	memset(toaddr, 0, sizeof(*toaddr));
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg))
+	{
+		if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO)
+		{
+			struct in_pktinfo *i = (struct in_pktinfo *) CMSG_DATA(cmsg);
+			memcpy(toaddr, &i->ipi_addr, sizeof(*toaddr));
+			break;
+		}
+	}
+
+	return r;
+}
+
+ssize_t sendtofrom(int s, void const *buf, size_t len, int flags,
+    struct sockaddr const *to, socklen_t tolen, struct in_addr const *from)
+{
+    struct msghdr msg;
+    struct cmsghdr *cmsg;
+    struct iovec vec;
+    struct in_pktinfo pktinfo;
+    char cbuf[CMSG_SPACE(sizeof(pktinfo))];
+
+    memset(&msg, 0, sizeof(msg));
+    msg.msg_name = (struct sockaddr *) to;
+    msg.msg_namelen = tolen;
+
+    vec.iov_base = (void *) buf;
+    vec.iov_len = len;
+    msg.msg_iov = &vec;
+    msg.msg_iovlen = 1;
+    msg.msg_flags = 0;
+
+    msg.msg_control = cbuf;
+    msg.msg_controllen = sizeof(cbuf);
+
+    cmsg = CMSG_FIRSTHDR(&msg);
+    cmsg->cmsg_level = SOL_IP;
+    cmsg->cmsg_type = IP_PKTINFO;
+    cmsg->cmsg_len = CMSG_LEN(sizeof(pktinfo));
+
+    memset(&pktinfo, 0, sizeof(pktinfo));
+    memcpy(&pktinfo.ipi_spec_dst, from, sizeof(*from));
+    memcpy(CMSG_DATA(cmsg), &pktinfo, sizeof(pktinfo));
+
+    return sendmsg(s, &msg, flags);
 }