Refactored BGP parsing to handle better BGP-LS and MPLS parsing.

Author: TimEvens

README.md

@@ -20,30 +20,21 @@ The database is tuned to support high transactional rates and storage for millio
 
 News
 ----
-### Sep-2-2014
-> OpenBMP now fully supports draft-ietf-grow-bmp-07
-
-* Added termination message parsing and storage
-* Pseudo schema has been updated to include v_peers
+### Sep-12-2014
+Refactored BGP parsing to make way for upcoming changes to support BGP-LS and MPLS/VPN's.
 
 
-### Aug-29-2014
-* Fixed an issue with peer down event BMP reason 2 causing the thread to exit.
-* Added full support of peer up notifications, including complete decode of the sent and received open message and capabilities.
-* Added new "v_peers" table as documented on http://www.openbmp.org/#!docs/DATABASE.md.
-* Bumped the current DB to use v1.3-pre2.
+### Sep-10-2014
+**Released version 0.7.1**   See [release-0.7.1](docs/release_notes/release-0.7.1.md) for more details.
 
-### Aug-27-2014
-Initiation sysName, sysDescr, and free form string values are now stored.
-
-Termination messages and peer up messages will be added shortly.   The v_peers VIEW does not exist yet
-because peer up messages are required.   Once the peer up messages are added (very soon) v_peers will be added.  This will provide a peers view into active neighbors.
+> OpenBMP now fully supports draft-ietf-grow-bmp-07
 
-New views will be created to provide consolidated reporting statistics per peer, such number of prefixes in RIB and peer down/peer up events.
+**Upcoming Changes:**
 
-JunOS 14.1 and IOS XE 3.12 verified.
+  * Refactor parsing and remove older BMP version support - Goign forward will be BMP v3 (current draft 07)
+  * Add BGP-LS support - IGP tables/views
+  * OpenBMP UI is being revised using ODL
 
-OpenBMP UI is being revised and will be updated soon.
 
 OpenBMP Flow
 ------------

Server/CMakeLists.txt

@@ -28,8 +28,8 @@ if (NOT MYSQLCONNECTORCPP_INCLUDE_DIR OR NOT MYSQLCONNECTORCPP_LIBRARY)
 #	Message ("mysql lib = " ${MYSQLCONNECTORCPP_LIBRARY})
 endif()
 
-# Update the include dir to include Mysql
-include_directories(${MYSQLCONNECTORCPP_INCLUDE_DIR} )
+# Update the include dir
+include_directories(${MYSQLCONNECTORCPP_INCLUDE_DIR} src/ src/bgp)
 
 
 # Define the source files to compile
@@ -38,20 +38,42 @@ set (SRC_FILES
 	src/BMPReader.cpp
 	src/DbImpl_mysql.cpp
 	src/openbmp.cpp
-	src/parseBGP.cpp
 	src/parseBMP.cpp
 	src/md5.cpp
 	src/Logger.cpp
-	src/BitByteUtils.cpp
 	src/client_thread.cpp
+	src/bgp/parseBGP.cpp
+	src/bgp/NotificationMsg.cpp
+	src/bgp/OpenMsg.cpp
+	src/bgp/UpdateMsg.cpp
+	src/bgp/MpReachAttr.cpp
+	src/bgp/MpUnReachAttr.cpp
 	) 
 
 # Disable warnings
 add_definitions ("-Wno-unused-result")
 
+# Add C++11
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag(--std=c++11 SUPPORTS_STD_CXX11)
+    check_cxx_compiler_flag(--std=c++0x SUPPORTS_STD_CXX01)
+    if(SUPPORTS_STD_CXX11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++11")
+    elseif(SUPPORTS_STD_CXX01)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++0x")
+    else()
+        message(ERROR "Compiler does not support --std=c++11 or --std=c++0x. Upgrade gcc 4.7 or greater")
+    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 ${MYSQLCONNECTORCPP_LIBRARY})
-include_directories(${MYSQLCONNECTORCPP_INCLUDE_DIR} )
 
 # Set the binary
 add_executable (openbmpd ${SRC_FILES})

Server/src/BMPListener.cpp

@@ -38,7 +38,7 @@ BMPListener::BMPListener(Logger *logPtr, Cfg_Options *config) {
     // Update pointer to the config
     cfg = config;
 
-    log = logPtr;
+    logger = logPtr;
 
     if (cfg->debug_bmp)
         enableDebug();

Server/src/BMPListener.h

@@ -74,7 +74,7 @@ class BMPListener {
 
 
 public:
-    Logger      *log;                       ///< Logging class pointer
+    Logger      *logger;                    ///< Logging class pointer
 
 private:
     Cfg_Options *cfg;                       ///< Config pointer

Server/src/BMPReader.cpp

@@ -40,7 +40,7 @@ BMPReader::BMPReader(Logger *logPtr, Cfg_Options *config) {
 
     cfg = config;
 
-    log = logPtr;
+    logger = logPtr;
 
     if (cfg->debug_bmp)
         enableDebug();
@@ -71,7 +71,7 @@ bool BMPReader::ReadIncomingMsg(BMPListener::ClientInfo *client, DbInterface *db
     DbInterface::tbl_bgp_peer p_entry;
 
     // Initialize the parser for BMP messages
-    parseBMP *pBMP = new parseBMP(log, &p_entry);    // handler for BMP messages
+    parseBMP *pBMP = new parseBMP(logger, &p_entry);    // handler for BMP messages
 
     if (cfg->debug_bmp) {
         enableDebug();
@@ -112,41 +112,35 @@ bool BMPReader::ReadIncomingMsg(BMPListener::ClientInfo *client, DbInterface *db
          * At this point we only have the BMP header message, what happens next depends
          *      on the BMP message type.
          */
-
         switch (bmp_type) {
             case parseBMP::TYPE_PEER_DOWN : { // Peer down type
-                // Read the reason code
-                char reason;
-                if (read(client->c_sock, &reason, 1) == 1) {
-                    LOG_NOTICE("sock=%d : %s: BGP peer down notification with reason code: %d",
-                            client->c_sock, p_entry.peer_addr, reason);
 
-                    DbInterface::tbl_peer_down_event down_event = {0};
+                DbInterface::tbl_peer_down_event down_event = {0};
+
+                if (pBMP->parsePeerDownEventHdr(client->c_sock,down_event)) {
+                    pBMP->bufferBMPMessage(client->c_sock);
 
-                    // Initialize the down_event struct
-                    down_event.bmp_reason = reason;
-                    memcpy(down_event.peer_hash_id, p_entry.hash_id, sizeof(p_entry.hash_id));
 
                     // Prepare the BGP parser
-                    pBGP = new parseBGP(log, dbi_ptr, &p_entry);
+                    pBGP = new parseBGP(logger, dbi_ptr, &p_entry, (char *)r_entry.src_addr);
                     if (cfg->debug_bgp)
                        pBGP->enableDebug();
 
                     // Check if the reason indicates we have a BGP message that follows
-                    switch (reason) {
+                    switch (down_event.bmp_reason) {
                         case 1 : { // Local system close with BGP notify
                             snprintf(down_event.error_text, sizeof(down_event.error_text),
                                     "Local close by (%s) for peer (%s) : ", r_entry.src_addr,
                                     p_entry.peer_addr);
-                            pBGP->handleMessage(client->c_sock, &down_event);
+                            pBGP->handleDownEvent(pBMP->bmp_data, pBMP->bmp_data_len, down_event);
                             break;
                         }
                         case 2 : // Local system close, no bgp notify
                         {
                             // Read two byte code corresponding to the FSM event
                             uint16_t fsm_event = 0 ;
                             if (recv(client->c_sock, &fsm_event, 2, MSG_WAITALL) == 2) {
-                                reverseBytes((unsigned char *)&fsm_event, sizeof(fsm_event));
+                                bgp::SWAP_BYTES(&fsm_event);
                             } else
                                 throw "ERROR: Failed to read 2 byte FSM code following peer down notify reason 2";
 
@@ -160,7 +154,7 @@ bool BMPReader::ReadIncomingMsg(BMPListener::ClientInfo *client, DbInterface *db
                                     "Remote peer (%s) closed local (%s) session: ", r_entry.src_addr,
                                     p_entry.peer_addr);
 
-                            pBGP->handleMessage(client->c_sock, &down_event);
+                            pBGP->handleDownEvent(pBMP->bmp_data, pBMP->bmp_data_len, down_event);
                             break;
                         }
                     }
@@ -180,17 +174,20 @@ bool BMPReader::ReadIncomingMsg(BMPListener::ClientInfo *client, DbInterface *db
             case parseBMP::TYPE_PEER_UP : // Peer up type
             {
                 DbInterface::tbl_peer_up_event up_event = {0};
+
                 if (pBMP->parsePeerUpEventHdr(client->c_sock, up_event)) {
                     LOG_INFO("%s: PEER UP Received, local addr=%s:%hu remote addr=%s:%hu", client->c_ipv4,
                             up_event.local_ip, up_event.local_port, p_entry.peer_addr, up_event.remote_port);
 
+                    pBMP->bufferBMPMessage(client->c_sock);
+
                     // Prepare the BGP parser
-                    pBGP = new parseBGP(log, dbi_ptr, &p_entry);
+                    pBGP = new parseBGP(logger, dbi_ptr, &p_entry, (char *)r_entry.src_addr);
                     if (cfg->debug_bgp)
                        pBGP->enableDebug();
 
                     // Parse the BGP sent/received open messages
-                    pBGP->handleMessage(client->c_sock, &up_event);
+                    pBGP->handleUpEvent(pBMP->bmp_data, pBMP->bmp_data_len, &up_event);
 
                     // Free the bgp parser
                     delete pBGP;
@@ -205,33 +202,44 @@ bool BMPReader::ReadIncomingMsg(BMPListener::ClientInfo *client, DbInterface *db
             }
 
             case parseBMP::TYPE_ROUTE_MON : { // Route monitoring type
+                pBMP->bufferBMPMessage(client->c_sock);
+
                 /*
                  * Read and parse the the BGP message from the client.
                  *     parseBGP will update mysql directly
                  */
-                pBGP = new parseBGP(log, dbi_ptr, &p_entry);
+                pBGP = new parseBGP(logger, dbi_ptr, &p_entry, (char *)r_entry.src_addr);
                 if (cfg->debug_bgp)
                     pBGP->enableDebug();
 
-                pBGP->handleMessage(client->c_sock);
+                pBGP->handleUpdate(pBMP->bmp_data, pBMP->bmp_data_len);
                 delete pBGP;
+
                 break;
             }
 
             case parseBMP::TYPE_STATS_REPORT : { // Stats Report
-                pBMP->handleStatsReport(dbi_ptr, client->c_sock);
+                DbInterface::tbl_stats_report stats = { 0 };
+                if (! pBMP->handleStatsReport(client->c_sock, stats))
+                    // Add to mysql
+                    dbi_ptr->add_StatReport(stats);
+
                 break;
             }
 
             case parseBMP::TYPE_INIT_MSG : { // Initiation Message
                 LOG_INFO("%s: Init message received with length of %u", client->c_ipv4, pBMP->getBMPLength());
-                pBMP->handleInitMsg(r_entry, dbi_ptr, client->c_sock);
+                pBMP->handleInitMsg(client->c_sock, r_entry);
+
+                // Update the router entry with the details
+                dbi_ptr->update_Router(r_entry);
                 break;
             }
 
             case parseBMP::TYPE_TERM_MSG : { // Termination Message
                 LOG_INFO("%s: Init message received with length of %u", client->c_ipv4, pBMP->getBMPLength());
-                pBMP->handleTermMsg(r_entry, dbi_ptr, client->c_sock);
+                pBMP->handleTermMsg(client->c_sock, r_entry);
+
                 dbi_ptr->disconnect_Router(r_entry);
                 close(client->c_sock);
 

Server/src/BMPReader.h

@@ -60,7 +60,7 @@ class BMPReader {
 
 
 public:
-    Logger      *log;                       ///< Logging class pointer
+    Logger      *logger;                    ///< Logging class pointer
 
 private:
     Cfg_Options *cfg;                       ///< Config pointer

Server/src/BitByteUtils.cpp

@@ -45,7 +45,7 @@ mysqlBMP::mysqlBMP(Logger *logPtr, char *hostURL, char *username, char *password
     stmt = NULL;
     con = NULL;
 
-    log = logPtr;
+    logger = logPtr;
 
     disableDebug();
     setMaxBlobSize(8192);
@@ -337,7 +337,7 @@ bool mysqlBMP::disconnect_Router(tbl_router &r_entry) {
 
             // Build the query
             snprintf(buf, sizeof(buf),
-                    "UPDATE %s SET isConnected=0,term_reason_code=%"PRIu16",term_reason_text=\"%s\",term_data='%s' where hash_id = '%s'",
+                    "UPDATE %s SET isConnected=0,term_reason_code=%" PRIu16 ",term_reason_text=\"%s\",term_data='%s' where hash_id = '%s'",
                     TBL_NAME_ROUTERS,
                     r_entry.term_reason_code, r_entry.term_reason_text, termData.c_str(),
                     r_hash_str.c_str());
@@ -542,7 +542,7 @@ void mysqlBMP::add_PathAttrs(tbl_path_attr &path_entry) {
         // Setup the initial MySQL query
         buf_len =
                 sprintf(buf, "INSERT into %s (%s) values ", TBL_NAME_PATH_ATTRS,
-                        "hash_id,peer_hash_id,origin,as_path,next_hop,med,local_pref,isAtomicAgg,aggregator,community_list,ext_community_list,cluster_list,originator_id,origin_as,as_path_count,timestamp");
+                        "hash_id,peer_hash_id,origin,as_path,next_hop,med,local_pref,isAtomicAgg,aggregator,community_list,ext_community_list,cluster_list,originator_id,origin_as,as_path_count,nexthop_isIPv4,timestamp");
 
         /*
          * Generate router table hash from the following fields
@@ -580,15 +580,15 @@ void mysqlBMP::add_PathAttrs(tbl_path_attr &path_entry) {
 
         buf_len +=
                 snprintf(buf2, sizeof(buf2),
-                        "('%s','%s','%s','%s','%s', %u,%u,%d,'%s','%s','%s','%s','%s','%"PRIu32"','%hu', from_unixtime(%u)),",
+                        "('%s','%s','%s','%s','%s', %u,%u,%d,'%s','%s','%s','%s','%s','%" PRIu32 "','%hu','%d',from_unixtime(%u)),",
                         path_hash_str.c_str(), p_hash_str.c_str(),
                         path_entry.origin, path_entry.as_path,
                         path_entry.next_hop, path_entry.med,
                         path_entry.local_pref, path_entry.atomic_agg,
                         path_entry.aggregator, path_entry.community_list,
                         path_entry.ext_community_list, path_entry.cluster_list,
                         path_entry.originator_id, path_entry.origin_as,
-                        path_entry.as_path_count,
+                        path_entry.as_path_count, path_entry.nexthop_isIPv4,
                         path_entry.timestamp_secs);
 
         // Cat the string to our query buffer
@@ -670,7 +670,7 @@ void mysqlBMP::add_StatReport(tbl_stats_report &stats) {
         hash_toStr(stats.peer_hash_id, p_hash_str);
 
         snprintf(buf, sizeof(buf),
-                "INSERT into %s (%s%s%s) values ('%s', %u, %u, %u, %u, %u, %u, %u, %"PRIu64", %"PRIu64")",
+                "INSERT into %s (%s%s%s) values ('%s', %u, %u, %u, %u, %u, %u, %u, %" PRIu64 ", %" PRIu64 ")",
                 TBL_NAME_STATS_REPORT,
                 "peer_hash_id,prefixes_rejected,known_dup_prefixes,known_dup_withdraws,",
                 "updates_invalid_by_cluster_list,updates_invalid_by_as_path_loop,updates_invalid_by_originagtor_id,",
@@ -709,7 +709,7 @@ void mysqlBMP::add_PeerUpEvent(DbInterface::tbl_peer_up_event &up_event) {
 
         // Insert the bgp peer up event
         snprintf(buf, sizeof(buf),
-                "REPLACE into %s (%s) values ('%s','%s','%s',%"PRIu16",%"PRIu16",%"PRIu32",%"PRIu16",%"PRIu16",'%s','%s')",
+                "REPLACE into %s (%s) values ('%s','%s','%s',%" PRIu16 ",%" PRIu16 ",%" PRIu32 ",%" PRIu16 ",%" PRIu16 ",'%s','%s')",
                 TBL_NAME_PEER_UP,
                 "peer_hash_id,local_ip,local_bgp_id,local_port,local_hold_time,local_asn,remote_port,remote_hold_time,sent_capabilities,recv_capabilities",
                 p_hash_str.c_str(), up_event.local_ip, up_event.local_bgp_id, up_event.local_port,up_event.local_hold_time,