Merge from Master

[l2tpns.git] / util.c

diff --git a/util.c b/util.c
index 0ab1d92..2cd9a9e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -8,7 +8,9 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <linux/rtnetlink.h>
 
+#include "dhcp6.h"
 #include "l2tpns.h"
 #ifdef BGP
 #include "bgp.h"
@@ -28,6 +30,17 @@ char *fmtaddr(in_addr_t addr, int n)
     return strcpy(addrs[n], inet_ntoa(in));
 }
 
+char *fmtMacAddr(uint8_t *pMacAddr)
+{
+       static char strMAC[2*ETH_ALEN];
+
+       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;
@@ -40,102 +53,109 @@ void *shared_malloc(unsigned int size)
 }
 
 extern int forked;
-extern int cluster_sockfd, tunfd, udpfd, controlfd, daefd, snoopfd, ifrfd, ifr6fd, rand_fd;
+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()
 {
-    pid_t pid = fork();
-    int i;
-
-    if (pid)
-       return pid;
-
-    forked++;
-    if (config->scheduler_fifo)
-    {
-       struct sched_param params = {0};
-       params.sched_priority = 0;
-       if (sched_setscheduler(0, SCHED_OTHER, &params))
+       pid_t pid = fork();
+       int i;
+
+       if (pid)
+               return pid;
+
+       forked++;
+       if (config->scheduler_fifo)
+       {
+               struct sched_param params = {0};
+               params.sched_priority = 0;
+               if (sched_setscheduler(0, SCHED_OTHER, &params))
+               {
+                       LOG(0, 0, 0, "Error setting scheduler to OTHER after fork: %s\n", strerror(errno));
+                       LOG(0, 0, 0, "This is probably really really bad.\n");
+               }
+       }
+
+       signal(SIGPIPE, SIG_DFL);
+       signal(SIGCHLD, SIG_DFL);
+       signal(SIGHUP,  SIG_DFL);
+       signal(SIGUSR1, SIG_DFL);
+       signal(SIGQUIT, SIG_DFL);
+       signal(SIGKILL, SIG_DFL);
+       signal(SIGTERM, SIG_DFL);
+
+       // Close sockets
+       if (clifd != -1)        close(clifd);
+       if (cluster_sockfd != -1)       close(cluster_sockfd);
+       if (tunfd != -1)        close(tunfd);
+
+       for (i = 0; i < config->nbudpfd; i++)
        {
-           LOG(0, 0, 0, "Error setting scheduler to OTHER after fork: %s\n", strerror(errno));
-           LOG(0, 0, 0, "This is probably really really bad.\n");
+               if (udpfd[i] != -1)     close(udpfd[i]);
        }
-    }
-
-    signal(SIGPIPE, SIG_DFL);
-    signal(SIGCHLD, SIG_DFL);
-    signal(SIGHUP,  SIG_DFL);
-    signal(SIGUSR1, SIG_DFL);
-    signal(SIGQUIT, SIG_DFL);
-    signal(SIGKILL, SIG_DFL);
-    signal(SIGTERM, SIG_DFL);
-
-    // Close sockets
-    if (clifd != -1)          close(clifd);
-    if (cluster_sockfd != -1) close(cluster_sockfd);
-    if (tunfd != -1)          close(tunfd);
-    if (udpfd != -1)          close(udpfd);
-    if (controlfd != -1)      close(controlfd);
-    if (daefd != -1)          close(daefd);
-    if (snoopfd != -1)        close(snoopfd);
-    if (ifrfd != -1)          close(ifrfd);
-    if (ifr6fd != -1)         close(ifr6fd);
-    if (rand_fd != -1)        close(rand_fd);
-    if (epollfd != -1)        close(epollfd);
-
-    for (i = 0; radfds && i < RADIUS_FDS; i++)
-       close(radfds[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);
+       for (i = 0; i < BGP_NUM_PEERS; i++)
+               if (bgp_peers[i].sock != -1)
+                       close(bgp_peers[i].sock);
 #endif /* BGP */
 
     return pid;
 }
 
 ssize_t recvfromto(int s, void *buf, size_t len, int flags,
-    struct sockaddr *from, socklen_t *fromlen, struct in_addr *toaddr)
+       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];
+       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;
+       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;
+       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);
+       msg.msg_control = cbuf;
+       msg.msg_controllen = sizeof(cbuf);
 
-    if ((r = recvmsg(s, &msg, flags)) < 0)
-       return r;
+       if ((r = recvmsg(s, &msg, flags)) < 0)
+               return r;
 
-    if (fromlen)
-       *fromlen = msg.msg_namelen;
+       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)
+       memset(toaddr, 0, sizeof(*toaddr));
+       for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg))
        {
-           struct in_pktinfo *i = (struct in_pktinfo *) CMSG_DATA(cmsg);
-           memcpy(toaddr, &i->ipi_addr, sizeof(*toaddr));
-           break;
+               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;
+       return r;
 }
 
 ssize_t sendtofrom(int s, void const *buf, size_t len, int flags,