bustle 0.5.3 → 0.5.4
raw patch · 6 files changed
+18/−5 lines, 6 files
Files
- Bustle/Loader/Pcap.hs +3/−0
- HACKING.md +0/−2
- Makefile +2/−0
- NEWS.md +6/−0
- bustle.cabal +1/−1
- c-sources/pcap-monitor.c +6/−2
Bustle/Loader/Pcap.hs view
@@ -254,4 +254,7 @@ readPcap path = try $ do p <- openOffline path + -- TODO: check link type header is DLT_DBUS or DLT_NULL (for+ -- backwards-compatibility)+ liftM partitionEithers $ evalStateT (mapBodies p convert) Map.empty
HACKING.md view
@@ -23,8 +23,6 @@ ```sh # Tag release, build and sign the tarballs make maintainer-make-release-gpg --detach-sign --armor dist/bustle-x.y.z.tar.gz-gpg --detach-sign --armor dist/bustle-x.y.z-x86_64.tar.bz2 # Stick source and binaries on freedesktop.org mkdir x.y.z
Makefile view
@@ -123,6 +123,8 @@ git tag -s -m 'Bustle '`cat dist/build/autogen/version.txt` \ bustle-`cat dist/build/autogen/version.txt` make maintainer-binary-tarball+ gpg --detach-sign --armor dist/bustle-`cat dist/build/autogen/version.txt`.tar.gz+ gpg --detach-sign --armor dist/bustle-`cat dist/build/autogen/version.txt`-x86_64.tar.bz2 .travis.yml: bustle.cabal make_travis_yml.hs ./make_travis_yml.hs $< libpcap-dev libgtk-3-dev libcairo2-dev happy-1.19.4 alex-3.1.3 > $@
NEWS.md view
@@ -1,3 +1,9 @@+Bustle 0.5.4 (2016-01-27)+-------------------------++* A single-byte functional change!+* Use `DLT_DBUS` link type in pcap files+ Bustle 0.5.3 (2016-01-11) -------------------------
bustle.cabal view
@@ -1,6 +1,6 @@ Name: bustle Category: Network, Desktop-Version: 0.5.3+Version: 0.5.4 Cabal-Version: >= 1.18 Tested-With: GHC >= 7.8.4 && < 7.11 Synopsis: Draw sequence diagrams of D-Bus traffic
c-sources/pcap-monitor.c view
@@ -23,6 +23,11 @@ #include <string.h> #include <pcap/pcap.h> +#ifndef DLT_DBUS+# define DLT_DBUS 231+#endif++ typedef struct { struct timeval ts; GByteArray *blob;@@ -428,8 +433,7 @@ return FALSE; } - /* FIXME: use DLT_DBUS when it makes it into libpcap. */- priv->p = pcap_open_dead (DLT_NULL, 1 << 27);+ priv->p = pcap_open_dead (DLT_DBUS, 1 << 27); if (priv->p == NULL) { g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,