diff --git a/src/cg3protocol.cpp b/src/cg3protocol.cpp index 053da9d..c8fc8a4 100644 --- a/src/cg3protocol.cpp +++ b/src/cg3protocol.cpp @@ -33,6 +33,9 @@ #include #include +#if !defined(ICMP_DEST_UNREACH) && defined(ICMP_UNREACH) +#define ICMP_DEST_UNREACH ICMP_UNREACH +#endif //////////////////////////////////////////////////////////////////////////////////////// // operation @@ -157,9 +160,10 @@ void CG3Protocol::PresenceTask(void) if ( m_PresenceSocket.Receive(&Buffer, &ReqIp, 20) != -1 ) { - CIp Ip(ReqIp); - Ip.GetSockAddr()->sin_port = htons(G3_DV_PORT); + socklen_t len; + struct sockaddr_in *sin = (struct sockaddr_in *)Ip.GetSockAddr(len); + sin->sin_port = htons(G3_DV_PORT); if (Buffer.size() == 32) { diff --git a/src/cip.h b/src/cip.h index c5a2f9d..60da8bd 100644 --- a/src/cip.h +++ b/src/cip.h @@ -47,6 +47,9 @@ public: void SetSockAddr(struct sockaddr_storage *, socklen_t); struct sockaddr_storage *GetSockAddr(socklen_t &); + // converter (IPv6 not supported) + uint32 GetAddr(void) const { return ((struct sockaddr_in *)&m_Addr)->sin_addr.s_addr; } + // operator bool operator ==(const CIp &) const; operator const char *() const; diff --git a/src/crawsocket.cpp b/src/crawsocket.cpp index a30908d..f7851c6 100644 --- a/src/crawsocket.cpp +++ b/src/crawsocket.cpp @@ -113,7 +113,7 @@ int CRawSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) Buffer->resize(iRecvLen); // get IP - Ip->SetSockAddr(&Sin); + Ip->SetSockAddr((struct sockaddr_storage *)&Sin, sizeof(Sin)); } } @@ -148,7 +148,7 @@ int CRawSocket::IcmpReceive(CBuffer *Buffer, CIp *Ip, int timeout) Sin.sin_family = AF_INET; Sin.sin_addr.s_addr = remote_iph->ip_dst.s_addr; - Ip->SetSockAddr(&Sin); + Ip->SetSockAddr((struct sockaddr_storage *)&Sin, sizeof(Sin)); } } diff --git a/src/cudpmsgsocket.cpp b/src/cudpmsgsocket.cpp index 45d438d..1439616 100644 --- a/src/cudpmsgsocket.cpp +++ b/src/cudpmsgsocket.cpp @@ -26,17 +26,41 @@ #include #include "cudpmsgsocket.h" +// both multiple socket and IPv6 are not supported +#define MsgSocket m_Socket[0] +#define MsgIp m_Ip[0] + //////////////////////////////////////////////////////////////////////////////////////// // open bool CUdpMsgSocket::Open(uint16 uiPort) { - bool ret; - int on = 1; + int on = 1, err = -1; + struct sockaddr_storage *ss; + socklen_t ss_len; + + if ( !CUdpSocket::Open(uiPort) ) { + return false; + } - ret = CUdpSocket::Open(uiPort); - setsockopt(m_Socket, IPPROTO_IP, IP_PKTINFO, (char *)&on, sizeof(on)); + ss = MsgIp.GetSockAddr(ss_len); + if ( ss->ss_family == AF_INET ) + { +#if defined(IP_PKTINFO) + err = setsockopt(MsgSocket, IPPROTO_IP, IP_PKTINFO, (char *)&on, sizeof(on)); +#elif defined(IP_RECVDSTADDR) + err = setsockopt(MsgSocket, IPPROTO_IP, IP_RECVDSTADDR, (char *)&on, sizeof(on)); +#endif + } - return ret; + if ( err < 0 ) + { + CUdpSocket::Close(); + return false; + } + else + { + return true; + } } @@ -55,12 +79,16 @@ int CUdpMsgSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) struct iovec Iov[1]; union { - struct cmsghdr cm; - unsigned char pktinfo_sizer[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)]; + struct cmsghdr cm; +#if defined(IP_PKTINFO) + unsigned char pktinfo_sizer[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)]; +#elif defined(IP_RECVDSTADDR) + unsigned char pktinfo_sizer[sizeof(struct cmsghdr) + sizeof(struct sockaddr_in)]; +#endif } Control; // socket valid ? - if ( m_Socket != -1 ) + if ( MsgSocket != -1 ) { // allocate buffer Buffer->resize(UDP_MSG_BUFFER_LENMAX); @@ -80,13 +108,13 @@ int CUdpMsgSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) // control socket FD_ZERO(&FdSet); - FD_SET(m_Socket, &FdSet); + FD_SET(MsgSocket, &FdSet); tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; - select(m_Socket + 1, &FdSet, 0, 0, &tv); + select(MsgSocket + 1, &FdSet, 0, 0, &tv); // read - iRecvLen = (int)recvmsg(m_Socket, &Msg, 0); + iRecvLen = (int)recvmsg(MsgSocket, &Msg, 0); // handle if ( iRecvLen != -1 ) @@ -95,17 +123,25 @@ int CUdpMsgSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) Buffer->resize(iRecvLen); // get IP - Ip->SetSockAddr(&Sin); + Ip->SetSockAddr((struct sockaddr_storage *)&Sin, sizeof(Sin)); // get local IP struct cmsghdr *Cmsg; for (Cmsg = CMSG_FIRSTHDR(&Msg); Cmsg != NULL; Cmsg = CMSG_NXTHDR(&Msg, Cmsg)) { +#if defined(IP_PKTINFO) 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; } +#elif defined(IP_RECVDSTADDR) + if (Cmsg->cmsg_level == IPPROTO_IP && Cmsg->cmsg_type == IP_RECVDSTADDR) + { + struct sockaddr_in *DestAddr = (struct sockaddr_in *)CMSG_DATA(Cmsg); + m_LocalAddr.s_addr = DestAddr->sin_addr.s_addr; + } +#endif } } } @@ -113,4 +149,3 @@ int CUdpMsgSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) // done return iRecvLen; } -