Changeset 89609d0


Ignore:
Timestamp:
11/14/18 10:46:01 (2 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
723f1af
Parents:
6f43f5c (diff), 4819d75 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into develop

Files:
2 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • README

    r096851a rbc86030  
    1 libtrace 4.0.4
     1libtrace 4.0.5
    22
    33---------------------------------------------------------------------------

  • configure.in

    r31111c7 rbc86030  
    44# and in the README
    55
    6 AC_INIT([libtrace],[4.0.4],[contact@wand.net.nz],[libtrace])
     6AC_INIT([libtrace],[4.0.5],[contact@wand.net.nz],[libtrace])
    77
    88LIBTRACE_MAJOR=4
    99LIBTRACE_MID=0
    10 LIBTRACE_MINOR=4
     10LIBTRACE_MINOR=5
    1111
    1212# OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not

  • debian/compat

    r78fe0d2 rdd48bb5  
    1 5
     19

  • debian/control

    rffe93e5 r4819d75  
    4040 and multiple input formats.
    4141 .
    42  libtrace is developed by the WAND Network Research Group at Waikato 
     42 libtrace is developed by the WAND Network Research Group at Waikato
    4343 University in New Zealand.
    4444
    … …  
    5555 the libpacketdump library.
    5656 .
    57  libpacketdump provides a library which can parse packets and display the 
     57 libpacketdump provides a library which can parse packets and display the
    5858 packet contents in a nice human-readable form. The output is similar to that
    5959 produced by tcpdump, although the formatting is somewhat more verbose.
    … …  
    7474 produced by tcpdump, although the formatting is somewhat more verbose.
    7575 .
    76  libpacketdump is developed by the WAND Network Research Group at Waikato 
     76 libpacketdump is developed by the WAND Network Research Group at Waikato
    7777 University in New Zealand.
    7878
    … …  
    8787 tasks that are required when analysing and manipulating network traces.
    8888 .
    89  Multiple input methods and formats are supported including device capture, 
     89 Multiple input methods and formats are supported including device capture,
    9090 raw and gz-compressed traces, and sockets.
    91  . 
    92  libtrace is developed by the WAND Network Research Group at Waikato 
     91 .
     92 libtrace is developed by the WAND Network Research Group at Waikato
    9393 University in New Zealand.

  • debian/copyright

    r78fe0d2 rdd48bb5  
    1 This package was debianized by Matt Brown <debian@mattb.net.nz> on
    2 Thu, 13 Oct 2005 00:28:25 +1300.
     1Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
     2Upstream-Name: Libtrace
     3Source: http://research.wand.net.nz/software/libtrace.php
    34
    4 It was downloaded from http://research.wand.net.nz/software/libtrace.php
    5 
    6 Copyright Holder:
    7 
    8 Copyright (c) 2007-2016 The University of Waikato, Hamilton, New Zealand.
    9 
    10 License:
    11 
    12     This program is free software: you can redistribute it and/or modify
    13     it under the terms of the GNU Lesser General Public License as published by
    14     the Free Software Foundation, either version 3 of the License, or
    15     (at your option) any later version.
    16 
    17     This program is distributed in the hope that it will be useful,
    18     but WITHOUT ANY WARRANTY; without even the implied warranty of
    19     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    20     GNU Lesser General Public License for more details.
    21 
    22     You should have received a copy of the GNU Lesser General Public License
    23     along with this program.  If not, see <http://www.gnu.org/licenses/>.
    24 
    25 On Debian systems, the complete text of the GNU Lesser General
    26 Public License can be found in `/usr/share/common-licenses/LGPL'.
     5Files: *
     6Copyright: 2018 The University of Waikato, Hamilton, New Zealand.
     7License: LGPL-3
     8 This package is free software; you can redistribute it and/or
     9 modify it under the terms of the GNU Lesser General Public
     10 License as published by the Free Software Foundation; either
     11 version 3 of the License, or (at your option)
     12 any later version.
     13 .
     14 This package is distributed in the hope that it will be useful,
     15 but WITHOUT ANY WARRANTY; without even the implied warranty of
     16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17 Lesser General Public License for more details.
     18 .
     19 You should have received a copy of the GNU Lesser General Public
     20 License along with this package; if not, write to the Free Software
     21 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
     22 .
     23 On Debian systems, the complete text of the GNU Lesser General
     24 Public License can be found in `/usr/share/common-licenses/LGPL-3'.

  • debian/libpacketdump4-dev.install

    r78fe0d2 rdd48bb5  
    11usr/include/libpacketdump*
    22usr/lib/libpacketdump*.so
    3 usr/lib/libpacketdump/*.so

  • debian/libpacketdump4.install

    r78fe0d2 rdd48bb5  
    11usr/lib/libpacketdump*.so.*
    22usr/lib/libpacketdump/*.protocol
     3usr/lib/libpacketdump/*.so

  • debian/libtrace4-dev.dirs

    r78fe0d2 rdd48bb5  
    11usr/lib
    22usr/include
     3usr/include/libtrace
    34usr/share/man/man3

  • debian/libtrace4-dev.install

    r78fe0d2 rdd48bb5  
    1 usr/include/libtrace*
    2 usr/include/rt_protocol.h
     1usr/include/libtrace*.h
     2usr/include/libtrace/*.h
    33usr/lib/libtrace*.so
    44usr/lib/libtrace*.a

  • debian/rules

    rffe93e5 r4819d75  
    2121
    2222
    23 libtrace_backup.h:
    24         # libtrace.h is modified by the build, so back it up so it can be restored
    25         # by the clean target
    26         cp lib/libtrace.h libtrace_backup.h
    27 
    2823configure:
    2924
    30 configure-stamp: configure libtrace_backup.h
     25configure-stamp: configure
    3126        dh_testdir
    32        
     27
    3328        dh_autoreconf
    34        
     29
    3530        ./configure $(CONFFLAGS) \
    3631                   --prefix=/usr \
    … …  
    3833                   --mandir=\$${prefix}/share/man \
    3934                   --infodir=\$${prefix}/share/info
    40        
     35
    4136        touch configure-stamp
    4237
    … …  
    5954        [ ! -f Makefile ] || $(MAKE) clean
    6055        [ ! -f Makefile ] || $(MAKE) distclean
    61         [ ! -f libtrace_backup.h ] || mv libtrace_backup.h lib/libtrace.h
    6256        rm -rf docs/doxygen
    63        
     57
    6458        dh_autoreconf_clean
    65         dh_clean 
     59        dh_clean
    6660
    6761install: build
    6862        dh_testdir
    6963        dh_testroot
    70         dh_clean -k 
     64        dh_clean -k
    7165        dh_installdirs
    7266
    7367        # Add here commands to install the package into debian/tmp
    7468        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
    75 
    7669
    7770# Build architecture-independent files here.
    … …  
    10194
    10295binary: binary-indep binary-arch
    103 .PHONY: build clean binary-indep binary-arch binary install 
     96.PHONY: build clean binary-indep binary-arch binary install

  • lib/format_ndag.c

    r6a2f037 r857729e  
    752752        }
    753753
     754        ssock->sock = join_multicast_group(src.groupaddr, src.localiface,
     755                        NULL, src.port, &(ssock->srcaddr));
     756
     757        if (ssock->sock < 0) {
     758                return -1;
     759        }
     760
     761        if (ssock->sock > rt->maxfd) {
     762                rt->maxfd = ssock->sock;
     763        }
     764
    754765#if HAVE_DECL_RECVMMSG
    755766        for (i = 0; i < RECV_BATCH_SIZE; i++) {
    … …  
    772783        ssock->recordcount = 0;
    773784        rt->sourcecount += 1;
    774 
    775         ssock->sock = join_multicast_group(src.groupaddr, src.localiface,
    776                         NULL, src.port, &(ssock->srcaddr));
    777 
    778         if (ssock->sock < 0) {
    779                 return -1;
    780         }
    781 
    782         if (ssock->sock > rt->maxfd) {
    783                 rt->maxfd = ssock->sock;
    784         }
    785785
    786786        fprintf(stderr, "Added new stream %s:%u to thread %d\n",
    … …  
    958958                        MSG_DONTWAIT, NULL);
    959959#else
     960        if (avail != 1) {
     961                return 0;
     962        }
     963
    960964        ret = recvmsg(ssock->sock, &(ssock->singlemsg), MSG_DONTWAIT);
    961965#endif
Note: See TracChangeset for help on using the changeset viewer.