- Update to 0.0.4
PR: ports/130577 Submitted by: Bjorn Konig <bkoenig@alpha-tierchen.de> (maintainer)
This commit is contained in:
parent
b0c0099b42
commit
4b629a8d48
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226188
13 changed files with 12 additions and 216 deletions
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= bcusdk
|
||||
PORTVERSION= 0.0.3
|
||||
PORTVERSION= 0.0.4
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://www.auto.tuwien.ac.at/~mkoegler/eib/
|
||||
PKGNAMESUFFIX= -eibd
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (bcusdk_0.0.3.tar.gz) = 62f660e6b9b56f6926bffb99922ffaa5
|
||||
SHA256 (bcusdk_0.0.3.tar.gz) = f431d251478f4a69a9fc89cb5f2ef70e5929bbf7147fc8019cb083d559363035
|
||||
SIZE (bcusdk_0.0.3.tar.gz) = 547053
|
||||
MD5 (bcusdk_0.0.4.tar.gz) = 14138f457d6530bf45cf6a966fde9d5f
|
||||
SHA256 (bcusdk_0.0.4.tar.gz) = 4d5cec9ae2d45e17ef2f566cb84f6895ae49255c86aacebc5af40839f1b5c0e9
|
||||
SIZE (bcusdk_0.0.4.tar.gz) = 574603
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- configure.orig 2007-11-08 15:31:54.000000000 +0000
|
||||
+++ configure 2007-12-08 14:37:29.000000000 +0000
|
||||
@@ -5332,7 +5332,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-have_source_info=no
|
||||
+have_source_info=yes
|
||||
have_linux_api=no
|
||||
echo "$as_me:$LINENO: checking for linux/rtnetlink.h" >&5
|
||||
echo $ECHO_N "checking for linux/rtnetlink.h... $ECHO_C" >&6
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/client/c/eibclient-int.h.orig 2007-11-08 15:31:32.000000000 +0000
|
||||
+++ eibd/client/c/eibclient-int.h 2007-12-08 15:18:31.000000000 +0000
|
||||
@@ -30,7 +30,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "eibclient.h"
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/client/c/openremote.c.orig 2007-11-08 15:31:32.000000000 +0000
|
||||
+++ eibd/client/c/openremote.c 2007-12-08 15:23:07.000000000 +0000
|
||||
@@ -25,6 +25,7 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/eibnet/eibnetdescribe.cpp.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/eibnet/eibnetdescribe.cpp 2007-12-08 15:37:00.000000000 +0000
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "eibnetip.h"
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/eibnet/eibnetsearch.cpp.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/eibnet/eibnetsearch.cpp 2007-12-08 15:37:52.000000000 +0000
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "eibnetip.h"
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/examples/common.c.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/examples/common.c 2007-12-08 15:26:19.000000000 +0000
|
||||
@@ -17,7 +17,6 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include "common.h"
|
||||
-#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- eibd/examples/common.h.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/examples/common.h 2007-12-08 15:00:10.000000000 +0000
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
+#include <unistd.h>
|
||||
#include "eibclient.h"
|
||||
|
||||
/** unsigned char*/
|
|
@ -1,11 +0,0 @@
|
|||
--- eibd/libserver/apdu.cpp.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/libserver/apdu.cpp 2007-12-08 15:08:18.000000000 +0000
|
||||
@@ -18,8 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <string.h>
|
||||
#include "apdu.h"
|
||||
|
||||
APDU *
|
||||
APDU::fromPacket (const CArray & c)
|
|
@ -1,115 +0,0 @@
|
|||
--- eibd/libserver/eibnetip.cpp.orig Thu Nov 8 16:31:33 2007
|
||||
+++ eibd/libserver/eibnetip.cpp Tue Dec 18 14:36:10 2007
|
||||
@@ -17,11 +17,9 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
-#include <string.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
#include <unistd.h>
|
||||
-#include <asm/types.h>
|
||||
#include "eibnetip.h"
|
||||
#include "config.h"
|
||||
#ifdef HAVE_LINUX_NETLINK
|
||||
@@ -34,6 +32,11 @@
|
||||
#include <iphlpapi.h>
|
||||
#undef Array
|
||||
#endif
|
||||
+#if defined(__FreeBSD__)
|
||||
+#include <netinet/in.h>
|
||||
+#include <net/if.h>
|
||||
+#include <net/route.h>
|
||||
+#endif
|
||||
|
||||
int
|
||||
GetHostIP (struct sockaddr_in *sock, const char *Name)
|
||||
@@ -45,6 +48,7 @@
|
||||
h = gethostbyname (Name);
|
||||
if (!h)
|
||||
return 0;
|
||||
+ sock->sin_len = sizeof (*sock);
|
||||
sock->sin_family = h->h_addrtype;
|
||||
sock->sin_addr.s_addr = (*((unsigned long *) h->h_addr_list[0]));
|
||||
return 1;
|
||||
@@ -144,6 +148,54 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if defined(__FreeBSD__)
|
||||
+typedef struct
|
||||
+{
|
||||
+ struct rt_msghdr hdr;
|
||||
+ char data[1000];
|
||||
+} r_req;
|
||||
+
|
||||
+int
|
||||
+GetSourceAddress (const struct sockaddr_in *dest, struct sockaddr_in *src)
|
||||
+{
|
||||
+ int s;
|
||||
+ r_req req;
|
||||
+ char *cp = req.data;
|
||||
+ memset(&req, 0, sizeof(req));
|
||||
+ memset(src, 0, sizeof (*src));
|
||||
+ s = socket(PF_ROUTE, SOCK_RAW, 0);
|
||||
+ if (s == -1)
|
||||
+ return 0;
|
||||
+ req.hdr.rtm_msglen = sizeof(req) + sizeof(*dest);
|
||||
+ req.hdr.rtm_version = RTM_VERSION;
|
||||
+ req.hdr.rtm_flags = RTF_UP;
|
||||
+ req.hdr.rtm_type = RTM_GET;
|
||||
+ req.hdr.rtm_addrs = RTA_DST | RTA_IFP;
|
||||
+ memcpy(cp, dest, sizeof(*dest));
|
||||
+ if (write (s, (char *)&req, req.hdr.rtm_msglen) < 0)
|
||||
+ return 0;
|
||||
+ if (read(s, (char *)&req, sizeof(req)) < 0)
|
||||
+ return 0;
|
||||
+ close(s);
|
||||
+ int i;
|
||||
+ cp = (char *)(&req.hdr + 1);
|
||||
+ for (i = 1; i; i <<= 1)
|
||||
+ if (i & req.hdr.rtm_addrs)
|
||||
+ {
|
||||
+ struct sockaddr *sa = (struct sockaddr *) cp;
|
||||
+ if (i == RTA_IFA)
|
||||
+ {
|
||||
+ src->sin_len = sizeof (*src);
|
||||
+ src->sin_family = AF_INET;
|
||||
+ src->sin_addr.s_addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
|
||||
+ return 1;
|
||||
+ }
|
||||
+ cp += SA_SIZE(sa);
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
EIBNetIPPacket::EIBNetIPPacket ()
|
||||
{
|
||||
service = 0;
|
||||
@@ -208,6 +260,7 @@
|
||||
return 1;
|
||||
ip = (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]);
|
||||
port = (buf[6] << 8) | (buf[7]);
|
||||
+ a->sin_len = sizeof (*a);
|
||||
a->sin_family = AF_INET;
|
||||
a->sin_port = htons (port);
|
||||
a->sin_addr.s_addr = htonl (ip);
|
||||
@@ -254,7 +307,7 @@
|
||||
if (fd != -1)
|
||||
{
|
||||
if (multicast)
|
||||
- setsockopt (fd, SOL_IP, IP_DROP_MEMBERSHIP, &maddr, sizeof (maddr));
|
||||
+ setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &maddr, sizeof (maddr));
|
||||
close (fd);
|
||||
}
|
||||
}
|
||||
@@ -265,7 +318,7 @@
|
||||
if (multicast)
|
||||
throw Exception (DEV_OPEN_FAIL);
|
||||
maddr = multicastaddr;
|
||||
- if (setsockopt (fd, SOL_IP, IP_ADD_MEMBERSHIP, &maddr, sizeof (maddr)) ==
|
||||
+ if (setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &maddr, sizeof (maddr)) ==
|
||||
-1)
|
||||
throw Exception (DEV_OPEN_FAIL);
|
||||
multicast = 1;
|
|
@ -1,15 +0,0 @@
|
|||
--- eibd/libserver/inetserver.cpp.orig 2007-11-08 15:31:33.000000000 +0000
|
||||
+++ eibd/libserver/inetserver.cpp 2007-12-08 15:29:25.000000000 +0000
|
||||
@@ -17,11 +17,11 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <unistd.h>
|
||||
-#include <string.h>
|
||||
#include "inetserver.h"
|
||||
|
||||
InetServer::InetServer (Layer3 * la3, Trace * tr, int port):
|
|
@ -15,9 +15,12 @@ bin/eibnetsearch
|
|||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupresponse
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketlisten
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketread
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketswrite
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketwrite
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsresponse
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupswrite
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupwrite
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/knxtool
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/madcread
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/maskver
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/bin/mmaskver
|
||||
|
@ -61,9 +64,12 @@ bin/eibnetsearch
|
|||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupresponse.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketlisten.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketread.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketswrite.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketwrite.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupsresponse.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupswrite.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/groupwrite.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/knxtool.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/madcread.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/maskver.c
|
||||
%%EXAMPLES%%%%EXAMPLESDIR%%/mmaskver.c
|
||||
|
@ -93,6 +99,8 @@ bin/eibnetsearch
|
|||
%%EXAMPLES%%%%EXAMPLESDIR%%/writeaddress.c
|
||||
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin
|
||||
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
|
||||
%%DATADIR%%/EIBConnection.cs
|
||||
@dirrm %%DATADIR%%
|
||||
%%JAVA%%%%JAVASHAREDIR%%/eibclient.jar
|
||||
include/eibclient.h
|
||||
include/eibloadresult.h
|
||||
|
|
Loading…
Reference in a new issue