Update project moved to github
Ok sthen, ajacoutot
This commit is contained in:
parent
50ad22dc13
commit
9b8ade53c3
@ -1,13 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2013/03/11 11:35:57 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2014/10/13 22:06:25 nigel Exp $
|
||||
|
||||
COMMENT= tool for extracting and gluing pcap (tcpdump) files
|
||||
|
||||
DISTNAME= tcpslice-2008.05.19
|
||||
PKGNAME= ${DISTNAME:S/.//g}
|
||||
REVISION = 0
|
||||
GH_ACCOUNT= the-tcpdump-group
|
||||
GH_PROJECT= tcpslice
|
||||
GH_COMMIT= 2837b722f0a6150971b327a252a59c64b24b9640
|
||||
|
||||
DISTNAME= tcpslice-20140501
|
||||
CATEGORIES= net
|
||||
|
||||
MASTER_SITES= http://www.tcpdump.org/weekly/
|
||||
HOME_PAGE= https://github.com/the-tcpdump-group/tcpslice
|
||||
|
||||
MAINTAINER= Nigel Taylor <nigel@openbsd.org>
|
||||
|
||||
|
@ -1,5 +1,2 @@
|
||||
MD5 (tcpslice-2008.05.19.tar.gz) = QfWIg1DUmjxKm7Fyss7v4Q==
|
||||
RMD160 (tcpslice-2008.05.19.tar.gz) = DWBpd5GiDyu8cjyXfmQj0ofbDNQ=
|
||||
SHA1 (tcpslice-2008.05.19.tar.gz) = ATNzBEVx3q88U1rg7ukCP+3Pd6w=
|
||||
SHA256 (tcpslice-2008.05.19.tar.gz) = skvsj/RTivcMhzM7Oc9GW2mSxCqBohCre6Ds2VKDq6w=
|
||||
SIZE (tcpslice-2008.05.19.tar.gz) = 113477
|
||||
SHA256 (tcpslice-20140501.tar.gz) = 0hHzerRN18LrsVNN/MzXx+bFLykx9AfajfN5xNMZ5tc=
|
||||
SIZE (tcpslice-20140501.tar.gz) = 112218
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
--- Makefile.in.orig Thu May 31 19:51:14 2007
|
||||
+++ Makefile.in Thu May 31 19:52:49 2007
|
||||
@@ -41,8 +41,8 @@ VPATH = @srcdir@
|
||||
$OpenBSD: patch-Makefile_in,v 1.4 2014/10/13 22:06:25 nigel Exp $
|
||||
--- Makefile.in.orig Mon Apr 7 14:09:35 2014
|
||||
+++ Makefile.in Fri Oct 10 13:15:24 2014
|
||||
@@ -39,8 +39,8 @@ VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
PROG = tcpslice
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@
|
||||
|
||||
# Standard CFLAGS
|
||||
@@ -61,9 +61,9 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
@@ -59,9 +59,9 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
# Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
|
||||
# Also, gcc does not remove the .o before forking 'as', which can be a
|
||||
# problem if you don't own the file but can write to the directory.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
--- search.c.orig Sat Aug 19 09:42:43 2006
|
||||
+++ search.c Wed Jun 4 12:14:33 2008
|
||||
@@ -306,8 +306,8 @@ find_header( pcap_t *p, u_char *buf, int buf_len,
|
||||
$OpenBSD: patch-search_c,v 1.4 2014/10/13 22:06:25 nigel Exp $
|
||||
--- search.c.orig Mon Apr 7 14:09:35 2014
|
||||
+++ search.c Fri Oct 10 13:15:24 2014
|
||||
@@ -302,8 +302,8 @@ find_header( pcap_t *p, u_char *buf, int buf_len,
|
||||
* present in the dump file.
|
||||
*/
|
||||
int
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
{
|
||||
time_t first_time = first_timestamp->tv_sec;
|
||||
off_t len_file;
|
||||
@@ -410,7 +410,7 @@ sf_find_end( pcap_t *p, struct timeval *first_timestam
|
||||
@@ -406,7 +406,7 @@ sf_find_end( pcap_t *p, struct timeval *first_timestam
|
||||
/* Takes two timeval's and returns the difference, tv2 - tv1, as a double. */
|
||||
|
||||
static double
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
{
|
||||
double result = (tv2->tv_sec - tv1->tv_sec);
|
||||
result += (tv2->tv_usec - tv1->tv_usec) / 1000000.0;
|
||||
@@ -422,7 +422,7 @@ timeval_diff( struct timeval *tv1, struct timeval *tv2
|
||||
@@ -418,7 +418,7 @@ timeval_diff( struct timeval *tv1, struct timeval *tv2
|
||||
/* Returns true if timestamp t1 is chronologically less than timestamp t2. */
|
||||
|
||||
int
|
||||
@ -30,7 +30,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
{
|
||||
return t1->tv_sec < t2->tv_sec ||
|
||||
(t1->tv_sec == t2->tv_sec &&
|
||||
@@ -436,9 +436,9 @@ sf_timestamp_less_than( struct timeval *t1, struct tim
|
||||
@@ -432,9 +432,9 @@ sf_timestamp_less_than( struct timeval *t1, struct tim
|
||||
*/
|
||||
|
||||
static off_t
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
{
|
||||
double full_span = timeval_diff( max_time, min_time );
|
||||
double desired_span = timeval_diff( desired_time, min_time );
|
||||
@@ -459,7 +459,7 @@ interpolated_position( struct timeval *min_time, off_t
|
||||
@@ -455,7 +455,7 @@ interpolated_position( struct timeval *min_time, off_t
|
||||
*/
|
||||
|
||||
static int
|
||||
@ -52,7 +52,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
{
|
||||
struct pcap_pkthdr hdr;
|
||||
const u_char *buf;
|
||||
@@ -468,7 +468,7 @@ read_up_to( pcap_t *p, struct timeval *desired_time )
|
||||
@@ -464,7 +464,7 @@ read_up_to( pcap_t *p, struct timeval *desired_time )
|
||||
|
||||
for ( ; ; )
|
||||
{
|
||||
@ -61,7 +61,7 @@ $OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $
|
||||
|
||||
pos = FTELL( pcap_file( p ) );
|
||||
buf = pcap_next( p, &hdr );
|
||||
@@ -516,12 +516,12 @@ read_up_to( pcap_t *p, struct timeval *desired_time )
|
||||
@@ -512,12 +512,12 @@ read_up_to( pcap_t *p, struct timeval *desired_time )
|
||||
|
||||
int
|
||||
sf_find_packet( pcap_t *p,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
--- tcpslice.c.orig Thu May 31 19:18:59 2007
|
||||
+++ tcpslice.c Thu May 31 19:20:16 2007
|
||||
@@ -101,7 +101,7 @@ extern size_t strlcpy(char *, const char *, size_t);
|
||||
$OpenBSD: patch-tcpslice_c,v 1.4 2014/10/13 22:06:25 nigel Exp $
|
||||
--- tcpslice.c.orig Mon Apr 7 14:09:35 2014
|
||||
+++ tcpslice.c Fri Oct 10 13:15:24 2014
|
||||
@@ -99,7 +99,7 @@ extern size_t strlcpy(char *, const char *, size_t);
|
||||
struct state {
|
||||
off_t start_pos, /* seek position corresponding to start time */
|
||||
stop_pos; /* seek position corresponding to stop time */
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
file_start_time, /* time of first pkt in file */
|
||||
file_stop_time, /* time of last pkt in file */
|
||||
last_pkt_time; /* time of most recently read pkt */
|
||||
@@ -125,18 +125,18 @@ enum stamp_styles timestamp_style = TIMESTAMP_RAW;
|
||||
@@ -123,18 +123,18 @@ enum stamp_styles timestamp_style = TIMESTAMP_RAW;
|
||||
|
||||
|
||||
int is_timestamp( char *str );
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
void dump_times(struct state *states, int numfiles);
|
||||
__dead void usage(void)__attribute__((volatile));
|
||||
|
||||
@@ -161,7 +161,7 @@ main(int argc, char **argv)
|
||||
@@ -159,7 +159,7 @@ main(int argc, char **argv)
|
||||
char *start_time_string = 0;
|
||||
char *stop_time_string = 0;
|
||||
const char *write_file_name = "-"; /* default is stdout */
|
||||
@ -44,7 +44,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
char ebuf[PCAP_ERRBUF_SIZE];
|
||||
struct state *states;
|
||||
|
||||
@@ -306,12 +306,12 @@ int is_timestamp( char *str )
|
||||
@@ -304,12 +304,12 @@ int is_timestamp( char *str )
|
||||
* containing the specified time.
|
||||
*/
|
||||
|
||||
@ -60,7 +60,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
time_t usecs = 0;
|
||||
int is_delta = (time_string[0] == '+');
|
||||
|
||||
@@ -485,10 +485,10 @@ fill_tm(char *time_string, int is_delta, struct tm *t,
|
||||
@@ -483,10 +483,10 @@ fill_tm(char *time_string, int is_delta, struct tm *t,
|
||||
|
||||
|
||||
/* Of all the files, what is the lowest start time. */
|
||||
@ -73,7 +73,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
|
||||
while (numfiles--) {
|
||||
if (sf_timestamp_less_than(&states->file_start_time, &min_time)) {
|
||||
@@ -500,10 +500,10 @@ lowest_start_time(struct state *states, int numfiles)
|
||||
@@ -498,10 +498,10 @@ lowest_start_time(struct state *states, int numfiles)
|
||||
}
|
||||
|
||||
/* Of all the files, what is the latest end time. */
|
||||
@ -86,7 +86,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
|
||||
while (numfiles--) {
|
||||
if (sf_timestamp_less_than(&max_time, &states->file_stop_time)) {
|
||||
@@ -599,12 +599,12 @@ open_files(char *filenames[], int numfiles)
|
||||
@@ -597,12 +597,12 @@ open_files(char *filenames[], int numfiles)
|
||||
|
||||
void
|
||||
extract_slice(struct state *states, int numfiles, const char *write_file_name,
|
||||
@ -102,7 +102,7 @@ $OpenBSD: patch-tcpslice_c,v 1.3 2007/07/13 08:16:16 rui Exp $
|
||||
int i;
|
||||
|
||||
struct state *last_state; /* remember the last packet */
|
||||
@@ -774,7 +774,7 @@ extract_slice(struct state *states, int numfiles, cons
|
||||
@@ -772,7 +772,7 @@ extract_slice(struct state *states, int numfiles, cons
|
||||
*/
|
||||
|
||||
char *
|
||||
|
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2007/07/13 08:16:16 rui Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2014/10/13 22:06:25 nigel Exp $
|
||||
@man man/man1/tcpslice.1
|
||||
sbin/tcpslice
|
||||
@bin sbin/tcpslice
|
||||
share/doc/tcpslice/
|
||||
@comment share/doc/tcpslice/CHANGES
|
||||
share/doc/tcpslice/README
|
||||
|
Loading…
Reference in New Issue
Block a user