Fixed missing librt for centos6.x builds and updated documentation links.

Author: TimEvens

CMakeLists.txt

@@ -4,7 +4,7 @@
 set (OPENBMP_VER_MAJOR "0")
 set (OPENBMP_VER_MINOR "11")
 set (OPENBMP_VER_PATCH "0")
-set (OPENBMP_VER_RELEASE "pre2")
+set (OPENBMP_VER_RELEASE "pre3")
 set (OPENBMPD_VERSION "${OPENBMP_VER_MAJOR}.${OPENBMP_VER_MINOR}.${OPENBMP_VER_PATCH}-${OPENBMP_VER_RELEASE}")
 
 cmake_minimum_required (VERSION 2.6)

README.md

@@ -17,12 +17,12 @@ A basic file consumer of OpenBMP parsed and RAW BMP Kafka streams. You can use t
 * Record BMP feeds (identical as they are sent by the router) so they can be replayed to other BMP parsers/receivers
 * Log parsed BMP and BGP messages in plain flat files
 
-See [file-consumer](docs/FILE_CONSUMER.md) for more details.
+See [file-consumer](http://www.openbmp.org/#!docs/FILE_CONSUMER.md) for more details.
 
 ### MySQL Consumer
 The MySQL consumer implements the OpenBMP Message Bus API parsed messages API to collect and store BMP/BGP data of all collectors, routers, and peers in real-time. The consumer provides the same data storage that OpenBMP collector versions 0.10.x and less implemented.
 
-See [mysql-consumer](docs/MYSQL_CONSUMER.md) for more details about the MySQL consumer. 
+See [mysql-consumer](http://www.openbmp.org/#!docs/MYSQL_CONSUMER.md) for more details about the MySQL consumer. 
 
 ### Message Bus (Kafka)
 Starting in release 0.11.x Apache Kafka is used as the centralized bus for collector message streams.   The collector no longer forwards direct to MySQL. Instead, database consumers are used to integrate the data into MySQL, Cassandra, MongoDb, Postgres, flat files, etc.  Anyone can now can interact with the BGP parsed and RAW data in a centralized fashion via Kafka or via one of the consumers.   A single BMP feed from one router can be made available to many consumers without the collector having to be aware of that.  
@@ -47,8 +47,8 @@ Supported Features Highlights
 -----------------------------
 Below is a list of some key features supported today in OpenBMP.  Many more features exist.
 
-| Feature | Description |
-| -------: | ----------- |
+Feature | Description 
+-------: | ----------- 
 draft-ietf-grow-bmp-14 | BMP Version 3 with backwards compatibility with older drafts
 Apache Kafka | Producer of parsed and RAW BMP feeds, multiple consumers available
 Database | Access to all collected data via standard ODBC/DB drivers (openbmp-mysql-consumer)
@@ -103,7 +103,7 @@ Added back BMPv1 support.  BMPv1 is supported best effort since it's missing the
 
 ### Oct-29-2014
 Added DNS PTR lookup for peers and routers.  Fixed minor issues and updated docs.  
-Added [DB REST](docs/DBREST.md)
+Added [DB REST](http://www.openbmp.org/#!docs/DBREST.md)
 
 
 ### Sep-10-2014
@@ -152,15 +152,14 @@ Using Kafka for Collector Integration
 -------------------------------------
 See the following docs for more details:
 
-* [docs/MSGBUS.md](docs/MSGBUS.md) - Details about Kafka and why it was chosen over AMQP. 
-* [docs/MSGBUS-PARSED.md](docs/MSGBUS-PARSED.md) - Detailed API spec for Parsed Messages via Kafka
-* [docs/MSGBUS-BMP.md](docs/MSGBUS-BMP.md) - Detailed API spec for RAW BMP feed messages via Kafka
+* [CONSUMER\_DEVELOPER\_INTEGRATION](docs/CONSUMER_DEVELOPER_INTEGRATION.md) - Details about Kafka and why it was chosen over AMQP. 
+* [MESSAGE\_BUS\_API](docs/MESSAGE_BUS_API.md) - Detailed API spec for Parsed and rAW BMP Messages via Kafka
 
 In the future, other feeds can be made available.  We are thinking of adding RAW BGP feeds as well (BMP headers stripped leaving only BGP RAW messages).  This may be useful but currently nobody has requested this. If you are interested in other types of feeds, please contact **tim@openbmp.org**. 
 
 Interfacing with the Database
 -----------------------------
-See the [DB_SCHEMA](docs/DB_SCHEMA.md) documentation for the database schema and how to interact with it.    
+See the [DB_SCHEMA](http://www.openbmp.org/#!docs/DB_SCHEMA.md) documentation for the database schema and how to interact with it.    
 
 
 Using Open Daylight

Server/CMakeLists.txt

@@ -31,12 +31,25 @@ find_library(LIBRDKAFKA_CPP_LIBRARY
         lib64
         lib)
 
+find_library(LIBRT_LIBRARY
+        NAMES
+        rt
+        HINTS
+        ${HINT_ROOT_DIR}
+        PATH_SUFFIXES
+        lib64
+        lib)
+
 if (NOT LIBRDKAFKA_INCLUDE_DIR OR NOT LIBRDKAFKA_LIBRARY OR NOT LIBRDKAFKA_CPP_LIBRARY)
 	Message (FATAL_ERROR "Librdkafka was not found, cannot proceed.  Visit https://github.com/edenhill/librdkafka for details on how to install it.")
 #else ()
 #	Message ("lib = " ${LIBRDKAFKA_LIBRARY})
 endif()
 
+if (NOT LIBRT_LIBRARY AND NOT MACOSX)
+    Message (FATAL_ERROR "librt was not found, cannot proceed.")
+endif()
+
 # Update the include dir
 include_directories(${LIBRDKAFKA_INCLUDE_DIR} src/ src/bmp src/bgp src/bgp/linkstate src/kafka)
 #link_directories(${LIBRDKAFKA_LIBRARY})
@@ -84,17 +97,18 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
     endif()
 endif()
 
-#--not-used--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=gnu++0x")
-#--not used-- list( APPEND CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
 # Set the libs to link
 set (LIBS pthread ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z)
 
 # Set the binary
 add_executable (openbmpd ${SRC_FILES})
 
 # Link the binary
-target_link_libraries (openbmpd ${LIBS}) 
+target_link_libraries (openbmpd ${LIBS})
+
+if (LIBRT_LIBRARY)
+    target_link_libraries(openbmpd ${LIBRT_LIBRARY})
+endif()
 
 # Install the binary and configs
 install(TARGETS openbmpd DESTINATION bin COMPONENT binaries)

Server/src/bmp/BMPListener.cpp

@@ -92,8 +92,7 @@ void BMPListener::open_socket(bool ipv4, bool ipv6) {
         }
 
         // Bind to the address/port
-        if (bind(sock, (struct sockaddr *) &svr_addr, sizeof(svr_addr)) < 0) {
-            perror("what");
+        if (::bind(sock, (struct sockaddr *) &svr_addr, sizeof(svr_addr)) < 0) {
             close(sock);
             throw "ERROR: Cannot bind to IPv4 address and port";
         }
@@ -114,7 +113,7 @@ void BMPListener::open_socket(bool ipv4, bool ipv6) {
         }
 
         // Bind to the address/port
-        if (bind(sockv6, (struct sockaddr *) &svr_addrv6, sizeof(svr_addrv6)) < 0) {
+        if (::bind(sockv6, (struct sockaddr *) &svr_addrv6, sizeof(svr_addrv6)) < 0) {
             close(sockv6);
             throw "ERROR: Cannot bind to IPv6 address and port";
         }

docs/CONSUMER_DEVELOPER_INTEGRATION.md

@@ -4,9 +4,9 @@ Consumer Developer Integration
 Developers can now integrate with the real-time message stream of both **parsed** messages and **BMP raw** binary data.   The openbmp collector is an Apache Kafka producer that produces real-time. Any application wishing to access the live stream can do so by simply creating an Apache Kafka consumer.    
 
 
-See [Message Bus API Specification](docs/MESSAGE_BUS_API.md) for details on the API specification. 
+See [Message Bus API Specification](MESSAGE_BUS_API.md) for details on the API specification. 
 
-Alternatively, the developer can interact with the MySQL database via the openbmp-mysql-consumer.  See [DB_SCHEMA](docs/DB_SCHMEA.md) for more details. 
+Alternatively, the developer can interact with the MySQL database via the openbmp-mysql-consumer.  See [DB_SCHEMA](http://www.openbmp.org/#!docs/DB_SCHMEA.md) for more details. 
 
 Reasons for using Apache Kafka
 ------------------------------

docs/INSTALL.md

@@ -1,8 +1,10 @@
 Install Steps
 =============
+
 See the various requirements and suggested system configurations at [Requirements](REQUIREMENTS.md)
 
 ### Recommended Current Linux Distributions
+
   1. Ubuntu 14.04/Trusty
   1. CentOS 7/RHEL 7
 
@@ -12,6 +14,7 @@ Ubuntu 14.04
 First install either the **Server** or **Cloud** standard Ubuntu image available from [Ubuntu Download](http://www.ubuntu.com/download)
 
 ### Required Steps
+
   1. Update the apt get repo
   1. Install openbmpd using package or from source
   1. Install openbmp MySQL consumer
@@ -29,11 +32,13 @@ First install either the **Server** or **Cloud** standard Ubuntu image available
 
 
 ### Before using 'apt-get' do the following to make sure the repositories are up-to-date
+
 ```
 sudo apt-get update
 ```
 
 ### Install openbmp via package
+
   1. Download the openbmp
 
       [package for Ubuntu 14.04](http://www.openbmp.org/#!download.md)
@@ -52,9 +57,11 @@ Setting up openbmp (0.8.0-pre) ...
 ```
 
 #### If installing from source
+
 Follow the steps in [BUILD](BUILD.md) to install via source from github.
 
 ### Install openbmp mysql consumer
+
   1. Download the openbmp-mysql-consumer
 
       [Download Page](http://www.openbmp.org/#!download.md)
@@ -63,6 +70,7 @@ Follow the steps in [BUILD](BUILD.md) to install via source from github.
 > The consumer is a JAR file that is runnable using java -jar \<filename\>.  In the near future this will be packaged in a DEB package so that you start it using 'service openbmp-mysql-consumer start'.  For now, you will need to run this JAR file via shell command.  See the last step regarding running the consumer for how to run it. 
 
 ### On DB server install mysql
+
 ```
 sudo apt-get install mysql-server-5.6
 ```
@@ -77,6 +85,7 @@ sudo apt-get install mysql-server-5.6
 
 
 ### Login to mysql and create the openbmp database and user account
+
 Apply the below to create the database and user that will be used by the openbmp daemon
 
 > **NOTE**
@@ -94,10 +103,12 @@ mysql -u root -p
 ```
 
 ### MySQL Temporary Table Space
+
 Large queries or queries that involve sorting/counting/... will use a temporary table on disk.   We have found that using a **tmpfs** will improve performance. 
 
 
 #### Create tmpfs (as root)
+
 The below will also configure the tmpfs to be mounted upon restart/boot.
 
     mkdir -p /var/mysqltmp
@@ -106,6 +117,7 @@ The below will also configure the tmpfs to be mounted upon restart/boot.
 
 
 ### Update the /etc/my.cnf file to enable InnoDB and tune memory
+
 The below **MUST** but adjusted based on your memory available.  Ideally it should be set as high as possible. Below is for a system that has 16G of RAM and 8vCPU.
 
 > #### IMPORTANT
@@ -170,6 +182,7 @@ innodb_write_io_threads   = 16
 * sudo service mysql restart
 
 ### Load the schema
+
 Load the openbmp DB schema by downloading it from www.openbmp.org.  You can also get the 
 latest from [GitHub OpenBMP](https://github.com/OpenBMP/openbmp)
 
@@ -188,6 +201,7 @@ mysql -u root -p openBMP < mysql-openbmp-current.db
 
 
 ### Run the openbmp server
+
 MySQL should be installed now and it should be running.   OpenBMP is ready to run. 
 
 **openbmpd**   *(normally installed in /usr/bin)*
@@ -232,6 +246,7 @@ sudo openbmpd -a $(uname -n) -k localhost -b 16 -p 5555 -l /var/log/openbmpd.log
 
 
 ### Run openbmp-mysql-consumer
+
 You can unpack the JAR file if you want to modify the logging config.  Otherwise,  you can run as follows:
 
 > Consumer can run on any platform

docs/MESSAGE_BUS_API.md

@@ -45,8 +45,9 @@ Message API: Parsed Data
 ------------------------------------
 
 ### Headers
-| Header | Value | Description |
-|--------|-------|-------------|
+
+Header | Value | Description 
+--------|-------|-------------
 **V**| 1 | Schema version, currently 1
 **C\_HASH\_ID** | hash string | Collector Hash Id
 **L** | length | Length of the data in bytes
@@ -67,8 +68,8 @@ Data is in **TSV** format
 #### Object: <font color="blue">collector</font> (openbmp.parsed.collector)
 Collector details.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **started** = Collector started<br>**change** = Collector had a router connection change<br>**heartbeat** = Collector periodic heartbeat<br>**stopped** = Collector was stopped/shutdown
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number. This increments for each collector record and restarts on collector restart or number wrap. 
 3 | Admin Id | String | 64 | Administrative Id (variable length string); can be IP, hostname, etc.
@@ -85,8 +86,8 @@ Collector details.
 #### Object: <font color="blue">router</font> (openbmp.parsed.router)
 One or more BMP routers.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **first** = first message received by the router, before the INIT message<br>**init** = Initiation message received<br>**term** = Termination message received or connection was closed
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each router record by collector and restarts on collector restart or number wrap. 
 3 | Name | String | 64 | String name of router (from BMP init message or dns PTR)
@@ -102,8 +103,8 @@ One or more BMP routers.
 #### Object: <font color="blue">peer</font> (openbmp.parsed.peer)
 One or more BGP peers.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **first** = first message received by the router, before the INIT message<br>**up** = PEER\_UP message received<br>**down** = PEER\_DOWN message received or connection was closed
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each peer record by collector and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ remote/peer ip, peer RD, router hash ]
@@ -141,8 +142,8 @@ One or more BGP peers.
 #### Object: <font color="blue">bmp\_stat</font> (openbmp.parsed.bmp\_stat)
 One or more bmp stat reports.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New stat report entry
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each record by peer and restarts on collector restart or number wrap.
 3 | Router Hash | String | 32 | Hash Id of router
@@ -165,8 +166,8 @@ One or more bmp stat reports.
 #### Object: <font color="blue">base\_attribute</font> (openbmp.parsed.base\_attribute)
 One or more attribute sets (does not include the NLRI's)
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New/Update entry<br>*There is no delete action since attributes are not withdrawn.  Attribute is considered stale/old when no RIB entries contain this hash id paird with peer and router hash id's*
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each attribute record by peer and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ as path, next hop, aggregator, origin, med, local pref, community list, ext community list, peer hash ]
@@ -194,8 +195,8 @@ One or more attribute sets (does not include the NLRI's)
 #### Object: <font color="blue">unicast\_prefix</font> (openbmp.parsed.unicast\_prefix)
 One or more IPv4/IPv6 unicast prefixes.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New/Update entry<br>**del** = Delete entry (withdrawn) - *Attributes are null/empty for withdrawn prefixes*
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each prefix record by peer and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ prefix, prefix length, peer hash ]
@@ -227,8 +228,8 @@ One or more IPv4/IPv6 unicast prefixes.
 #### Object: <font color="blue">ls\_node</font> (openbmp.parsed.ls\_node)
 One or more link-state nodes.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New/Update entry<br>**del** = Delete entry (withdrawn) - *Attributes are null/empty for withdrawn prefixes*
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each  record by peer and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ igp router id, bgp ls id, asn, ospf area id ]
@@ -257,8 +258,8 @@ One or more link-state nodes.
 #### Object: <font color="blue">ls\_link</font> (openbmp.parsed.ls\_link)
 One or more link-state links.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New/Update entry<br>**del** = Delete entry (withdrawn) - *Attributes are null/empty for withdrawn prefixes*
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each  record by peer and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ interface ip, neighbor ip, link id, local node hash, remote node hash, local link id, remote link id, peer hash ]
@@ -301,8 +302,8 @@ One or more link-state links.
 #### Object: <font color="blue">ls\_prefix</font> (openbmp.parsed.ls\_prefix)
 One or more link-state prefixes.
 
-| # | Field | Data Type | Size in Bytes | Details |
-|---|-------|-----------|---------------|---------|
+\# | Field | Data Type | Size in Bytes | Details 
+---|-------|-----------|---------------|---------
 1 | Action | String | 32 | **add** = New/Update entry<br>**del** = Delete entry (withdrawn) - *Attributes are null/empty for withdrawn prefixes*
 2 | Sequence | Int | 8 | 64bit unsigned number indicating the sequence number.  This increments for each  record by peer and restarts on collector restart or number wrap.
 3 | Hash | String | 32 | Hash ID for this entry; Hash of fields [ igp router id, bgp ls id, asn, ospf area id ]
@@ -339,8 +340,8 @@ Message API: BMP RAW Data
 ------------------------------------
 
 ### Headers
-| Header | Value | Description |
-|--------|-------|-------------|
+Header | Value | Description 
+--------|-------|-------------
 **V**| 1 | Schema version, currently 1
 **C\_HASH\_ID** | hash string | Collector Hash Id
 **R\_HASH\_ID** | hash string | Router Hash Id