Merge pull request #86 from CAIDA/fix-large-mrt

Fix parsing large mrt (>64k)
CAIDA · Apr 4, 2019 · 8dca9af · 8dca9af
2 parents e579acd + 57465e1
commit 8dca9af
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,13 @@
 BGPStream Change Log
 ====================
 
+v1.2.3
+------
+ - Released 2019-04-04
+
+### Bug Fixes
+ - Fixed an issue where BGPStream would crash when parsing MRT records that are larger than 64k (#79)
+
 v1.2.2
 ------
  - Released 2019-02-13

diff --git a/configure.ac b/configure.ac
@@ -23,11 +23,11 @@
 
 AC_PREREQ([2.68])
 
-AC_INIT([bgpstream], [1.2.2], [bgpstream-info@caida.org])
+AC_INIT([bgpstream], [1.2.3], [bgpstream-info@caida.org])
 
 BGPSTREAM_MAJOR_VERSION=1
 BGPSTREAM_MID_VERSION=2
-BGPSTREAM_MINOR_VERSION=2
+BGPSTREAM_MINOR_VERSION=3
 
 LIBBGPSTREAM_MAJOR_VERSION=2
 LIBBGPSTREAM_MID_VERSION=0

diff --git a/lib/bgpdump/bgpdump_mstream.h b/lib/bgpdump/bgpdump_mstream.h
@@ -33,7 +33,7 @@ Original Author: Dan Ardelean (dan@ripe.net)
 
 typedef struct mstream {
   u_char *start;
-  u_int16_t position;
+  u_int32_t position;
   u_int32_t len;
 } mstream_t;
 

diff --git a/pybgpstream/setup.py b/pybgpstream/setup.py
@@ -10,7 +10,7 @@
 setup(name = "pybgpstream",
       description = "A Python interface to BGPStream",
       long_description = "Provides a high-level interface for live and historical BGP data analysis. PyBGPStream requires the libBGPStream C library, available at http://bgpstream.caida.org/download.",
-      version = "1.2.2",
+      version = "1.2.3",
       author = "Alistair King",
       author_email = "bgpstream-info@caida.org",
       url="http://bgpstream.caida.org",