mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity
303907e562
freebsd-ports/dns/dualserver/files/patch-dualserverd.cpp

212 lines
6.9 KiB
C++
Raw Blame History

--- dualserverd.cpp.orig 2015-07-27 19:41:31.000000000 +0000
+++ dualserverd.cpp 2015-07-27 19:46:28.000000000 +0000
@@ -22,10 +22,16 @@
#include <math.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+#ifdef __FreeBSD__
+#include <sys/socket.h>
+#endif
#include <limits.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
+#ifdef __FreeBSD__
+#include <net/if_dl.h>
+#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
@@ -39,6 +45,9 @@
#include <syslog.h>
#include <pthread.h>
#include <map>
+#ifdef __FreeBSD__
+#include <ifaddrs.h>
+#endif
using namespace std;
#include "dualserverd.h"
@@ -84,7 +93,11 @@
const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nContent-Length: \r\n\r\n";
//const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nTransfer-Encoding: chunked\r\n";
const char line200[] = "<td>%s</td>";
+#ifdef __FreeBSD__
+const char sVersion[] = "Dual DHCP DNS Server Version 6.94 for FreeBSD";
+#else
const char sVersion[] = "Dual DHCP DNS Server Version 6.94 Linux Build 7011";
+#endif
const data4 opData[] =
{
{ "SubnetMask", DHCP_OPTION_NETMASK, 3 },
@@ -261,7 +274,7 @@
strcpy(leaFile, "/tmp/dualserver.state");
if (!iniFile[0])
- strcpy(iniFile, "/etc/dualserver.ini");
+ strcpy(iniFile, "/usr/local/etc/dualserver.conf");
if (verbatim)
{
@@ -4002,7 +4015,13 @@
else if (req->dhcpp.header.bp_broadcast || !req->remote.sin_addr.s_addr || req->reqIP)
{
req->remote.sin_port = htons(IPPORT_DHCPC);
+#ifdef __FreeBSD__
+ req->remote.sin_addr.s_addr = network.dhcpConn[req->sockInd].addr.sin_addr.s_addr |
+ (~network.dhcpConn[req->sockInd].mask);
+ //printf("broadcast dhcp response to %s\n",inet_ntoa(req->remote.sin_addr));
+#else
req->remote.sin_addr.s_addr = INADDR_BROADCAST;
+#endif
req->dhcpp.header.bp_broadcast = 1;
}
else
@@ -8983,6 +9002,10 @@
newNetwork.dhcpConn[i].broadCastSize = sizeof(newNetwork.dhcpConn[i].broadCastVal);
setsockopt(newNetwork.dhcpConn[i].sock, SOL_SOCKET, SO_BROADCAST, (char*)&newNetwork.dhcpConn[i].broadCastVal, newNetwork.dhcpConn[i].broadCastSize);
+#ifdef __FreeBSD__
+ // See man ip
+ setsockopt(newNetwork.dhcpConn[i].sock,IPPROTO_IP, IP_ONESBCAST,(char*)&newNetwork.dhcpConn[i].broadCastVal, newNetwork.dhcpConn[i].broadCastSize);
+#endif
int nRet = bind(newNetwork.dhcpConn[i].sock, (sockaddr*)&newNetwork.dhcpConn[i].addr, sizeof(struct sockaddr_in));
if (nRet == SOCKET_ERROR)
@@ -9034,7 +9057,11 @@
setsockopt(newNetwork.dhcpListener.sock, SOL_SOCKET, SO_REUSEADDR, (char*)&newNetwork.dhcpListener.reUseVal, newNetwork.dhcpListener.reUseSize);
newNetwork.dhcpListener.pktinfoVal = true;
newNetwork.dhcpListener.pktinfoSize = sizeof(newNetwork.dhcpListener.pktinfoVal);
+#ifdef __FreeBSD__
+ setsockopt(newNetwork.dhcpListener.sock, IPPROTO_IP, IP_RECVIF, &newNetwork.dhcpListener.pktinfoVal, newNetwork.dhcpListener.pktinfoSize);
+#else
setsockopt(newNetwork.dhcpListener.sock, IPPROTO_IP, IP_PKTINFO, &newNetwork.dhcpListener.pktinfoVal, newNetwork.dhcpListener.pktinfoSize);
+#endif
newNetwork.dhcpListener.addr.sin_family = AF_INET;
newNetwork.dhcpListener.addr.sin_addr.s_addr = INADDR_ANY;
@@ -9458,6 +9485,10 @@
else
return false;
}
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#define NEXTIFR(i) \
+ ((struct ifreq *)((char *)&(i)->ifr_addr \
+ + MAX((i)->ifr_addr.sa_len, sizeof((i)->ifr_addr))) )
void getInterfaces(data1 *network)
{
@@ -9469,14 +9500,16 @@
if (ioctl(cfig.fixedSocket, SIOCGIFCONF, &Ifc) >= 0)
{
+ struct ifreq *ifrp, *ifen;
MYDWORD addr, mask;
short flags;
struct ifreq pIfr;
- MYBYTE numInterfaces = Ifc.ifc_len / sizeof(ifreq);
+ ifrp = (struct ifreq *)Ifc.ifc_buf;
+ ifen = (struct ifreq *)((char *)Ifc.ifc_buf + Ifc.ifc_len);
- for (MYBYTE i = 0 ; i < numInterfaces; i++)
- {
- memcpy(&pIfr, &(IfcBuf[i]), sizeof(ifreq));
+ for (; ifrp < ifen;) {
+ memcpy(&pIfr, ifrp, sizeof(ifreq));
+ ifrp = NEXTIFR(ifrp);
if (!ioctl(cfig.fixedSocket, SIOCGIFADDR, &pIfr))
addr = ((struct sockaddr_in*)&pIfr.ifr_addr)->sin_addr.s_addr;
@@ -9496,8 +9529,11 @@
if (addr && !(flags & IFF_LOOPBACK))
addServer(network->allServers, addr);
-
+#ifdef __FreeBSD__
+ if (addr && mask && !(flags & IFF_POINTOPOINT) && !(flags & IFF_LOOPBACK))
+#else
if (addr && mask && !(flags & IFF_POINTOPOINT) && !(flags & IFF_LOOPBACK) && !(flags & IFF_DYNAMIC))
+#endif
{
if ((flags & IFF_RUNNING) && (flags & IFF_UP))
{
@@ -9656,6 +9692,12 @@
MYWORD gdmess(data9 *req, MYBYTE sockInd)
{
+#ifdef __FreeBSD__
+ struct cmsghdr *cmsg;
+ struct sockaddr_dl * isdl;
+ struct sockaddr_in *isin;
+ struct ifaddrs *ifap, *ifa;
+#endif
//sprintf(logBuff, "Socket=%u", sockInd);
//logDHCPMess(logBuff, 1);
memset(req, 0, sizeof(data9));
@@ -9671,7 +9713,11 @@
req->msg.msg_name = &req->remote;
req->msg.msg_namelen = sizeof(sockaddr_in);
req->msg.msg_control = &req->msgcontrol;
+#ifdef __FreeBSD__
+ req->msg.msg_controllen = sizeof(req->msgcontrol);
+#else
req->msg.msg_controllen = sizeof(msg_control);
+#endif
req->msg.msg_flags = msgflags;
int flags = 0;
@@ -9680,6 +9726,45 @@
if (errno || req->bytes <= 0)
return 0;
+#ifdef __FreeBSD__
+ isdl = NULL;
+ isin = NULL;
+ MYDWORD addr=0;
+ bool found_addr = false;
+
+ if (req->msg.msg_controllen>0){
+ for (cmsg=CMSG_FIRSTHDR(&req->msg);cmsg;cmsg=CMSG_NXTHDR(&req->msg,cmsg)){
+ if (cmsg->cmsg_type==IP_RECVIF) {
+ isdl=(struct sockaddr_dl *)CMSG_DATA(cmsg);
+ }
+ }
+ }
+
+ if (!isdl || getifaddrs(&ifap))
+ return 0;
+
+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+ if(ifa->ifa_addr->sa_family == AF_INET &&
+ strcmp(ifa->ifa_name,isdl->sdl_data) == 0){
+ isin = (struct sockaddr_in *)ifa->ifa_addr;
+ addr = isin->sin_addr.s_addr;
+ for (int i = 0; (i < MAX_SERVERS || !network.dhcpConn[i].server);i++){
+ if (addr == network.dhcpConn[i].server){
+ found_addr = true;
+ req->sockInd = i;
+ break;
+ }
+ }
+ }
+ }
+ freeifaddrs(ifap);
+
+ if(!found_addr) return 0;
+
+ //printf("IF = %s\n", isdl->sdl_data);
+ //printf("RADDR = %s\n", inet_ntoa(isin->sin_addr));
+
+#else
//printf("%u\n", req->msg.msg_controllen);
//msgcontrol = (msg_control*)msg.msg_control;
@@ -9711,6 +9796,7 @@
break;
}
}
+#endif
}
else
{
Reference in New Issue View Git Blame Copy Permalink