Attachment #82080 for bug #117463

View | Details | Raw Unified | Return to bug 117463
Collapse All | Expand All

Lines 6-15 Link Here

(-)sipp/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= sipp	8	PORTNAME= sipp
9	PORTVERSION= 2.0.20070906	9	PORTVERSION= 2.0.20071024
10	CATEGORIES= net	10	CATEGORIES= benchmarks net
11	MASTER_SITES= http://sipp.sourceforge.net/snapshots/	11	MASTER_SITES= http://sipp.sourceforge.net/snapshots/
12	DISTNAME= ${PORTNAME}.2007-09-06	12	DISTNAME= ${PORTNAME}.2007-10-24
13		13
14	MAINTAINER= tut@nhamon.com.ua	14	MAINTAINER= tut@nhamon.com.ua
15	COMMENT= SIP testing tool	15	COMMENT= SIP testing tool

Lines 1-3 Link Here

(-)sipp/distinfo (-3 / +3 lines)
1	MD5 (sipp.2007-09-06.tar.gz) = b96d01b1435912ea65fd0092c98f130e	1	MD5 (sipp.2007-10-24.tar.gz) = 430463e6d8c651a82a8826fcf76a1cb1
2	SHA256 (sipp.2007-09-06.tar.gz) = b20de66bdd6b33b8d5441e3655f6e8f247dbcd40b9853e43ab9992f8122ff7eb	2	SHA256 (sipp.2007-10-24.tar.gz) = 4970692fb624e55c39ec8e954242d0a9a243744d6e46c8ace8c591d0c3efa984
3	SIZE (sipp.2007-09-06.tar.gz) = 197176	3	SIZE (sipp.2007-10-24.tar.gz) = 198008




 
 #Linker Flags
 LFLAGS_hpux=-AA -mt
@@ -138,7 +136,7 @@
 LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
 LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
 LIBS_tru64= -lcurses -lpthread
-LIBS_freebsd= -lcurses -pthread
+LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
 LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
 LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
 LIBS_Darwin= -lcurses
@@ -146,7 +144,7 @@
 
 # Include directories
 INCDIR_linux=-I. -I/usr/include/openssl
-INCDIR_freebsd=-I. -I/opt/openssl/include
+INCDIR_freebsd=-I. -I/usr/local/include
 INCDIR_hpux=-I. -I/usr/local/include -I/opt/openssl/include
 INCDIR_tru64=-I. -I/opt/openssl/include
 INCDIR_SunOS=-I. -I/usr/local/ssl/include/
@@ -154,8 +152,6 @@
 INCDIR_Darwin=-I. -I/usr/local/ssl/include
 INCDIR=$(INCDIR_$(SYSTEM)) 




$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.c,v 1.1 2006/12/21 23:07:44 miwi Exp $

--- prepare_pcap.c.orig
+++ prepare_pcap.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
-#if defined(__HPUX) || defined(__CYGWIN)
+#if defined(__HPUX) || defined(__CYGWIN) || defined(__FreeBSD__)
 #include <netinet/in_systm.h>
 #endif
 #include <netinet/ip.h>
@@ -142,7 +142,7 @@
         fprintf(stderr, "prepare_pcap.c: Ignoring non UDP packet!\n");
         continue;
       }
-#if defined(__DARWIN) || defined(__CYGWIN)
+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
       udphdr = (struct udphdr *)((char *)iphdr + (iphdr->ihl << 2) + 4);
       pktlen = (u_long)(ntohs(udphdr->uh_ulen));
 #else
@@ -164,7 +164,7 @@
       ERROR("Can't allocate memory for pcap pkt data");
     memcpy(pkt_index->data, udphdr, pktlen);
 
-#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
     udphdr->uh_sum = 0 ;      
 #else
     udphdr->check = 0;
@@ -173,14 +173,14 @@
       // compute a partial udp checksum
       // not including port that will be changed
       // when sending RTP
-#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
     pkt_index->partial_check = check((u_int16_t *) &udphdr->uh_ulen, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
 #else
     pkt_index->partial_check = check((u_int16_t *) &udphdr->len, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
 #endif
     if (max_length < pktlen)
       max_length = pktlen;
-#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
     if (base > ntohs(udphdr->uh_dport))
       base = ntohs(udphdr->uh_dport);
 #else




$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.h,v 1.1 2006/12/21 23:07:44 miwi Exp $

--- prepare_pcap.h.orig
+++ prepare_pcap.h
@@ -22,7 +22,7 @@
 #include <netinet/udp.h>
 #include <time.h>
 
-#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN)
+#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
 #define u_int8_t uint8_t
 #define u_int16_t uint16_t
 #define u_int32_t uint32_t




$FreeBSD: ports/net/sipp/files/patch-send_packets.c,v 1.1 2006/12/21 23:07:44 miwi Exp $

--- send_packets.c.orig
+++ send_packets.c
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <netinet/udp.h>
-#if defined(__DARWIN) || defined(__CYGWIN)
+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
 #include <netinet/in.h>
 #endif
 #ifndef __CYGWIN

Return to bug 117463

Lines 54-77 Link Here

(-)sipp/files/patch-Makefile (-18 lines)
54		54
55	#Linker Flags	55	#Linker Flags
56	LFLAGS_hpux=-AA -mt	56	LFLAGS_hpux=-AA -mt
57	@@ -138,7 +136,7 @@
58	LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
59	LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
60	LIBS_tru64= -lcurses -lpthread
61	-LIBS_freebsd= -lcurses -pthread
62	+LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
63	LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
64	LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
65	LIBS_Darwin= -lcurses
66	@@ -146,7 +144,7 @@
67
68	# Include directories
69	INCDIR_linux=-I. -I/usr/include/openssl
70	-INCDIR_freebsd=-I. -I/opt/openssl/include
71	+INCDIR_freebsd=-I. -I/usr/local/include
72	INCDIR_hpux=-I. -I/usr/local/include -I/opt/openssl/include
73	INCDIR_tru64=-I. -I/opt/openssl/include
74	INCDIR_SunOS=-I. -I/usr/local/ssl/include/
75	@@ -154,8 +152,6 @@	57	@@ -154,8 +152,6 @@
76	INCDIR_Darwin=-I. -I/usr/local/ssl/include	58	INCDIR_Darwin=-I. -I/usr/local/ssl/include
77	INCDIR=$(INCDIR_$(SYSTEM))	59	INCDIR=$(INCDIR_$(SYSTEM))

Lines 1-48 Link Here

(-)sipp/files/patch-prepare_pcap.c (-48 lines)
1	$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.c,v 1.1 2006/12/21 23:07:44 miwi Exp $
2
3	--- prepare_pcap.c.orig
4	+++ prepare_pcap.c
5	@@ -19,7 +19,7 @@
6	#include <stdlib.h>
7	#include <netinet/in.h>
8	#include <netinet/udp.h>
9	-#if defined(__HPUX) \|\| defined(__CYGWIN)
10	+#if defined(__HPUX) \|\| defined(__CYGWIN) \|\| defined(__FreeBSD__)
11	#include <netinet/in_systm.h>
12	#endif
13	#include <netinet/ip.h>
14	@@ -142,7 +142,7 @@
15	fprintf(stderr, "prepare_pcap.c: Ignoring non UDP packet!\n");
16	continue;
17	}
18	-#if defined(__DARWIN) \|\| defined(__CYGWIN)
19	+#if defined(__DARWIN) \|\| defined(__CYGWIN) \|\| defined(__FreeBSD__)
20	udphdr = (struct udphdr )((char )iphdr + (iphdr->ihl << 2) + 4);
21	pktlen = (u_long)(ntohs(udphdr->uh_ulen));
22	#else
23	@@ -164,7 +164,7 @@
24	ERROR("Can't allocate memory for pcap pkt data");
25	memcpy(pkt_index->data, udphdr, pktlen);
26
27	-#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN)
28	+#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN) \|\| defined(__FreeBSD__)
29	udphdr->uh_sum = 0 ;
30	#else
31	udphdr->check = 0;
32	@@ -173,14 +173,14 @@
33	// compute a partial udp checksum
34	// not including port that will be changed
35	// when sending RTP
36	-#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN)
37	+#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN) \|\| defined(__FreeBSD__)
38	pkt_index->partial_check = check((u_int16_t *) &udphdr->uh_ulen, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
39	#else
40	pkt_index->partial_check = check((u_int16_t *) &udphdr->len, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
41	#endif
42	if (max_length < pktlen)
43	max_length = pktlen;
44	-#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN)
45	+#if defined(__HPUX) \|\| defined(__DARWIN) \|\| (defined __CYGWIN) \|\| defined(__FreeBSD__)
46	if (base > ntohs(udphdr->uh_dport))
47	base = ntohs(udphdr->uh_dport);
48	#else

Lines 1-13 Link Here

(-)sipp/files/patch-prepare_pcap.h (-13 lines)
1	$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.h,v 1.1 2006/12/21 23:07:44 miwi Exp $
2
3	--- prepare_pcap.h.orig
4	+++ prepare_pcap.h
5	@@ -22,7 +22,7 @@
6	#include <netinet/udp.h>
7	#include <time.h>
8
9	-#if defined(__HPUX) \|\| defined(__DARWIN) \|\| defined(__CYGWIN)
10	+#if defined(__HPUX) \|\| defined(__DARWIN) \|\| defined(__CYGWIN) \|\| defined(__FreeBSD__)
11	#define u_int8_t uint8_t
12	#define u_int16_t uint16_t
13	#define u_int32_t uint32_t

Lines 1-13 Link Here

(-)sipp/files/patch-send_packets.c (-13 lines)
1	$FreeBSD: ports/net/sipp/files/patch-send_packets.c,v 1.1 2006/12/21 23:07:44 miwi Exp $
2
3	--- send_packets.c.orig
4	+++ send_packets.c
5	@@ -45,7 +45,7 @@
6	#include <unistd.h>
7	#include <stdlib.h>
8	#include <netinet/udp.h>
9	-#if defined(__DARWIN) \|\| defined(__CYGWIN)
10	+#if defined(__DARWIN) \|\| defined(__CYGWIN) \|\| defined(__FreeBSD__)
11	#include <netinet/in.h>
12	#endif
13	#ifndef __CYGWIN