ShaYmez/xlxd
1
0
Fork 0
mirror of https://github.com/ShaYmez/xlxd.git synced 2025-09-03 21:57:50 -04:00
Code Issues Projects Releases Wiki Activity

Update

Browse Source 
Revert udpsocket to original
This commit is contained in:
Marius Petrescu, YO2LOJ 2020-02-22 16:44:20 +02:00
parent 73648794f0
commit a81d1743a8
2 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/cudpsocket.cpp
View File

@ -53,7 +53,6 @@ CUdpSocket::~CUdpSocket()
bool CUdpSocket::Open(uint16 uiPort) bool CUdpSocket::Open(uint16 uiPort)
{ {
bool open = false; bool open = false;
int on = 1;
// create socket // create socket
m_Socket = socket(PF_INET,SOCK_DGRAM,0); m_Socket = socket(PF_INET,SOCK_DGRAM,0);
@ -68,7 +67,6 @@ bool CUdpSocket::Open(uint16 uiPort)
if ( bind(m_Socket, (struct sockaddr *)&m_SocketAddr, sizeof(struct sockaddr_in)) == 0 ) if ( bind(m_Socket, (struct sockaddr *)&m_SocketAddr, sizeof(struct sockaddr_in)) == 0 )
{ {
fcntl(m_Socket, F_SETFL, O_NONBLOCK); fcntl(m_Socket, F_SETFL, O_NONBLOCK);
setsockopt(m_Socket, IPPROTO_IP, IP_PKTINFO, (char *)&on, sizeof(on));
open = true; open = true;
} }
else else
@ -101,34 +99,10 @@ int CUdpSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout)
unsigned int uiFromLen = sizeof(struct sockaddr_in); unsigned int uiFromLen = sizeof(struct sockaddr_in);
int iRecvLen = -1; int iRecvLen = -1;
struct timeval tv; struct timeval tv;
struct msghdr Msg;
struct iovec Iov[1];
union {
struct cmsghdr cm;
unsigned char pktinfo_sizer[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)];
} Control;
// socket valid ? // socket valid ?
if ( m_Socket != -1 ) if ( m_Socket != -1 )
{ {
// allocate buffer
Buffer->resize(UDP_BUFFER_LENMAX);
//prepare msghdr
bzero(&Msg, sizeof(Msg));
Iov[0].iov_base = Buffer->data();
Iov[0].iov_len = UDP_BUFFER_LENMAX;
bzero(&Sin, sizeof(Sin));
Msg.msg_name = &Sin;
Msg.msg_namelen = sizeof(Sin);
Msg.msg_iov = Iov;
Msg.msg_iovlen = 1;
Msg.msg_control = &Control;
Msg.msg_controllen = sizeof(Control);
// control socket // control socket
FD_ZERO(&FdSet); FD_ZERO(&FdSet);
FD_SET(m_Socket, &FdSet); FD_SET(m_Socket, &FdSet);
@ -136,8 +110,13 @@ int CUdpSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout)
tv.tv_usec = (timeout % 1000) * 1000; tv.tv_usec = (timeout % 1000) * 1000;
select(m_Socket + 1, &FdSet, 0, 0, &tv); select(m_Socket + 1, &FdSet, 0, 0, &tv);
// allocate buffer
Buffer->resize(UDP_BUFFER_LENMAX);
// read // read
iRecvLen = (int)recvmsg(m_Socket, &Msg, 0); iRecvLen = (int)recvfrom(m_Socket,
(void *)Buffer->data(), UDP_BUFFER_LENMAX,
0, (struct sockaddr *)&Sin, &uiFromLen);
// handle // handle
if ( iRecvLen != -1 ) if ( iRecvLen != -1 )
@ -147,17 +126,6 @@ int CUdpSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout)
// get IP // get IP
Ip->SetSockAddr(&Sin); Ip->SetSockAddr(&Sin);
// get local IP
struct cmsghdr *Cmsg;
for (Cmsg = CMSG_FIRSTHDR(&Msg); Cmsg != NULL; Cmsg = CMSG_NXTHDR(&Msg, Cmsg))
{
if (Cmsg->cmsg_level == IPPROTO_IP && Cmsg->cmsg_type == IP_PKTINFO)
{
struct in_pktinfo *PktInfo = (struct in_pktinfo *)CMSG_DATA(Cmsg);
m_LocalAddr.s_addr = PktInfo->ipi_spec_dst.s_addr;
}
}
} }
} }

2
src/cudpsocket.h
View File

@ -68,12 +68,10 @@ public:
int Send(const char *, const CIp &); int Send(const char *, const CIp &);
int Send(const char *, const CIp &, uint16); int Send(const char *, const CIp &, uint16);
struct in_addr *GetLocalAddr(void) { return &m_LocalAddr; }
protected: protected:
// data // data
int m_Socket; int m_Socket;
struct sockaddr_in m_SocketAddr; struct sockaddr_in m_SocketAddr;
struct in_addr m_LocalAddr;
}; };
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////