From 3271247d471453f1b6271db584d49b0ac1bf7ece Mon Sep 17 00:00:00 2001 From: LX1IQ Date: Tue, 7 Apr 2020 11:53:36 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b61a1dd..ef3f33a 100644 --- a/README.md +++ b/README.md @@ -136,4 +136,4 @@ Pay attention, the XLX Server acts as an YSF Master, which provides 26 wires-x r It has nothing to do with the regular YSFReflector network, hence you don’t need to register your XLX at ysfreflector.de ! -© 2016 Jean-Luc Deltombe and Luc Engelmann LX1IQ +© 2016 Jean-Luc Deltombe (LX3JL) and Luc Engelmann (LX1IQ) From 3ee08dc49ef145a8ce9d3c0b327b81b1b1948257 Mon Sep 17 00:00:00 2001 From: LX1IQ Date: Sun, 12 Apr 2020 09:53:47 +0200 Subject: [PATCH 2/5] Create ambed.service start ambed server as a service on debian --- scripts/ambed.service | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 scripts/ambed.service diff --git a/scripts/ambed.service b/scripts/ambed.service new file mode 100644 index 0000000..8332fae --- /dev/null +++ b/scripts/ambed.service @@ -0,0 +1,15 @@ +[Unit] +Description=AMBE Transcoder Daemon +After=network.target + +[Service] +Type=simple +User=root +Group=root +ExecStartPre=-/sbin/rmmod ftdi_sio +ExecStartPre=-/sbin/rmmod usb_serial +ExecStart=/ambed/ambed 127.0.0.1 +Restart=on-abnormal + +[Install] +WantedBy=multi-user.target From 3713ab92ce86b877da32b9a0d6f2b88dcf1691ba Mon Sep 17 00:00:00 2001 From: LX1IQ Date: Sun, 12 Apr 2020 10:04:44 +0200 Subject: [PATCH 3/5] Create scripts.readme.txt --- scripts/scripts.readme.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 scripts/scripts.readme.txt diff --git a/scripts/scripts.readme.txt b/scripts/scripts.readme.txt new file mode 100644 index 0000000..4008da3 --- /dev/null +++ b/scripts/scripts.readme.txt @@ -0,0 +1,20 @@ +************************************************* +*copy xlxd into /etc.init.d/ +*copy ambed.service into /etc/systemd/system/ +* +************************************************* +* xlxd executable must be in /xlxd/ folder +* ambed executable must be in /ambed/ folder +* +************************************************* +* possible options: +* +* #systemctl start ambed /starts ambed +* #systemctl status ambed /shows status of ambed +* #systemctl stop ambed /stops ambed +* # systemctl restart ambed /restarts ambed +* +* automatically get it to start on boot: +* #systemctl enable ambed +* +************************************************* From b7e3e77d137e9e1e2478fe8b22608e410c64d885 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Thu, 9 Apr 2020 06:34:20 +0900 Subject: [PATCH 4/5] D-STAR G3: fix for IPv6-supported CIp, CUdpSocket class and *BSD support D-STAR G3 support strongly depends on IPv4, no IPv6 support. --- src/cg3protocol.cpp | 8 ++++-- src/cip.h | 3 +++ src/crawsocket.cpp | 4 +-- src/cudpmsgsocket.cpp | 62 ++++++++++++++++++++++++++++++++++--------- 4 files changed, 60 insertions(+), 17 deletions(-) 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..6f2dfb0 100644 --- a/src/cudpmsgsocket.cpp +++ b/src/cudpmsgsocket.cpp @@ -26,17 +26,42 @@ #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; - ret = CUdpSocket::Open(uiPort); - setsockopt(m_Socket, IPPROTO_IP, IP_PKTINFO, (char *)&on, sizeof(on)); + if ( !CUdpSocket::Open(uiPort) ) + { + return false; + } - return ret; + 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 + } + + if ( err < 0 ) + { + CUdpSocket::Close(); + return false; + } + else + { + return true; + } } @@ -55,12 +80,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 +109,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 +124,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 +150,3 @@ int CUdpMsgSocket::Receive(CBuffer *Buffer, CIp *Ip, int timeout) // done return iRecvLen; } - From 3c9549e11ae02deb075258b535a67e5690f48dfc Mon Sep 17 00:00:00 2001 From: 9W2LWK Date: Fri, 17 Apr 2020 15:08:28 +0800 Subject: [PATCH 5/5] Update country.csv --- dashboard2/pgs/country.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboard2/pgs/country.csv b/dashboard2/pgs/country.csv index 5038fd9..9847c24 100755 --- a/dashboard2/pgs/country.csv +++ b/dashboard2/pgs/country.csv @@ -82,7 +82,7 @@ Djibouti;DJ;J2 Dodecanese;GR;SV5-J45 Dominica;DM;J7 Dominican Republic;DO;HI -East Malaysia;MY;9M6-9M8 +East Malaysia;MY;9M6-9M8-9W6-9W8 Easter Island;CL;CE0 Eastern Kiribati (Line Island);KI;T32 Ecuador;EC;HC-HD @@ -299,7 +299,7 @@ Virgin Islands U.S.;VI;KP2 Wake Island;US;KH9 Wales;WL;2W-GC-GW-MW Wallis and Futuna;WF;FW -West Malaysia;MY;9M2-9M4-9W2 +West Malaysia;MY;9M2-9M4-9W2-9W4 Western Kiribati (Gilbert Island);KI;T30 Western Sahara;EH;S0 Willis Island;AU;VK9W