Merge pull request #41 from rtbrick/dev

Dev

Author: GIC-de

docs/config.md

@@ -171,6 +171,7 @@ Attribute | Description | Default
 `address-ipv6` | Local network interface IPv6 address (implicitly /64) | -
 `gateway-ipv6` | Gateway network interface IPv6 address (implicitly /64)
 `vlan` | Network interface VLAN | 0 (untagged)
+`gateway-mac`| Optional set gateway MAC address manually 
 
 ### Access Interfaces
 
@@ -181,6 +182,7 @@ Attribute | Description | Default
 `interface` | Access interface name (e.g. eth0, ...)
 `type` | Switch the access type between `pppoe` (PPP over Ethernet) and `ipoe` (IP over Ethernet) | pppoe
 `vlan-mode` | Set VLAN mode `1:1` or `N:1` | 1:1
+`qinq` | Set outer VLAN ethertype to QinQ (0x88a8) | false
 `outer-vlan-min` | Outer VLAN minimum value | 0 (untagged)
 `outer-vlan-max` | Outer VLAN maximum value | 0 (untagged)
 `outer-vlan` |Set outer-vlan-min/max equally
@@ -447,6 +449,8 @@ Attribute | Description | Default
 `keepalive-interval` | LCP echo request interval in seconds (0 means disabled) | 30
 `keepalive-retry` | PPP LCP echo request max retry | 3
 `start-delay` | PPP LCP initial request delay in milliseconds | 0
+`ignore-vendor-specific` | Ignore LCP vendor specific requests | false
+`connection-status-message` | Accept LCP connection status messages | false
 
 ### PPP IPCP
 
@@ -608,7 +612,7 @@ Attribute | Description | Default
 `direction` | Mandatory stream direction (`upstream`, `downstream` or `both`) | `both`
 `priority` | IPv4 TOS / IPv6 TC | 0
 `vlan-priority` | VLAN priority | 0
-`length` | Layer 3 (IP + payload) traffic length (76 - 1500) | 128
+`length` | Layer 3 (IP + payload) traffic length (76 - 9000) | 128
 `pps` | Stream traffic rate in packets per second | 1
 `bps` | Stream traffic rate in bits per second (layer 3) |
 `network-ipv4-address` | Overwrite network interface IPv4 address |

docs/ipoe.md

@@ -58,8 +58,10 @@ The most common case for IPoE is using DHCPv4/v6 as shown below.
 }
 ```
 
+## IPoE Session Information
+
 The control socket command `session-info session-id <id>` provides
-detailed information for IPOE sessions. 
+detailed information for IPoE sessions. 
 
 `$ sudo bngblaster-cli run.sock session-info session-id 1 | jq .`
 ```json

docs/pppoe.md

@@ -96,8 +96,24 @@ detailed explained in the configuration section.
 }
 ```
 
+## LCP Vendor Extension
+
+This chapter refers to RFC 2153 PPP vendor extensions.
+
+Per default all LCP vendor specific requests will be rejected sending a
+LCP code reject message. With `ppp->lcp->ignore-vendor-specific` enabled,
+those messages will be ignored as required to emulate different CPE 
+behaviors.
+
+The option `ppp->lcp->connection-status-message` allows to accept LCP vendor requests 
+with any OUI if kind is set to `1` by responding with vendor request of 
+kind `2`. The OUI from request is copied to response in this case.
+The value from request is stored in the session as `connection-status-message`.
+
+## PPPoE Session Information
+
 The control socket command `session-info session-id <id>` provides
-detailed information for IPOE sessions. 
+detailed information for PPPoE sessions. 
 
 `$ sudo bngblaster-cli run.sock session-info session-id 1 | jq .`
 ```json

src/bbl.c

@@ -715,6 +715,8 @@ main (int argc, char *argv[])
             exit(1);
         }
         ctx->op.network_if->access = false;
+        /* Copy gateway MAC from config (default 00:00:00:00:00:00) */
+        memcpy(ctx->op.network_if->gateway_mac, ctx->config.gateway_mac, ETH_ADDR_LEN);
         if(ctx->config.network_ip && ctx->config.network_gateway) {
             if(ctx->config.network_ip && ctx->config.network_gateway) {
                 ctx->op.network_if->ip = ctx->config.network_ip;

src/bbl.h

@@ -364,6 +364,8 @@ typedef struct bbl_access_config_
     uint16_t access_inner_vlan_max;
     uint16_t access_third_vlan;
 
+    bool qinq; /* use ethertype 0x8818 */
+    
     /* Static */
     uint32_t static_ip;
     uint32_t static_ip_iter;
@@ -568,6 +570,8 @@ typedef struct bbl_ctx_
         char network_if[IFNAMSIZ];
         uint32_t network_ip;
         uint32_t network_gateway;
+        uint8_t gateway_mac[ETH_ADDR_LEN];
+
         ipv6_prefix network_ip6;
         ipv6_prefix network_gateway6;
         uint16_t network_vlan;
@@ -626,6 +630,8 @@ typedef struct bbl_ctx_
         uint16_t lcp_keepalive_interval;
         uint16_t lcp_keepalive_retry;
         uint16_t lcp_start_delay;
+        bool lcp_vendor_ignore;
+        bool lcp_connection_status_message;
 
         /* Authentication */
         uint16_t authentication_timeout;
@@ -881,6 +887,9 @@ typedef struct bbl_session_
     uint16_t    auth_protocol; /* PAP or CHAP */
     uint8_t     auth_retries;
 
+    char       *reply_message;
+    char       *connections_status_message;
+
     /* IPCP */
     ppp_state_t ipcp_state;
     uint8_t     ipcp_response_code;

src/bbl_config.c

@@ -277,6 +277,10 @@ json_parse_access_interface (bbl_ctx_s *ctx, json_t *access_interface, bbl_acces
         return false;
     }
 
+    value = json_object_get(access_interface, "qinq");
+    if (json_is_boolean(value)) {
+        access_config->qinq = json_boolean_value(value);
+    }
     value = json_object_get(access_interface, "outer-vlan");
     if (json_is_number(value)) {
         access_config->access_outer_vlan_min = json_number_value(value);
@@ -584,7 +588,7 @@ json_parse_stream (bbl_ctx_s *ctx, json_t *stream, bbl_stream_config *stream_con
     value = json_object_get(stream, "length");
     if (value) {
         stream_config->length = json_number_value(value);
-        if(stream_config->length < 76 || stream_config->length > 1500) {
+        if(stream_config->length < 76 || stream_config->length > 9000) {
             fprintf(stderr, "JSON config error: Invalid value for stream->length\n");
             return false;
         }
@@ -868,6 +872,14 @@ json_parse_config (json_t *root, bbl_ctx_s *ctx) {
                     return false;
                 }
             }
+            value = json_object_get(sub, "ignore-vendor-specific");
+            if (json_is_boolean(value)) {
+                ctx->config.lcp_vendor_ignore = json_boolean_value(value);
+            }
+            value = json_object_get(sub, "connection-status-message");
+            if (json_is_boolean(value)) {
+                ctx->config.lcp_connection_status_message = json_boolean_value(value);
+            }
         }
         sub = json_object_get(section, "ipcp");
         if (json_is_object(sub)) {
@@ -1175,6 +1187,19 @@ json_parse_config (json_t *root, bbl_ctx_s *ctx) {
                 }
                 ctx->config.network_gateway6.len = 64;
             }
+            if (json_unpack(sub, "{s:s}", "gateway-mac", &s) == 0) {
+                if (sscanf(s, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+                        &ctx->config.gateway_mac[0],
+                        &ctx->config.gateway_mac[1],
+                        &ctx->config.gateway_mac[2],
+                        &ctx->config.gateway_mac[3],
+                        &ctx->config.gateway_mac[4],
+                        &ctx->config.gateway_mac[5]) < 6) 
+                {
+                    fprintf(stderr, "JSON config error: Invalid value for network->gateway-mac\n");
+                    return false;
+                }
+            }
             value = json_object_get(sub, "vlan");
             if (json_is_number(value)) {
                 ctx->config.network_vlan = json_number_value(value);

src/bbl_ctrl.c

@@ -504,7 +504,7 @@ bbl_ctrl_session_info(int fd, bbl_ctx_s *ctx, uint32_t session_id, json_t* argum
         }
 
         if(session->access_type == ACCESS_TYPE_PPPOE) {
-            root = json_pack("{ss si s{ss si ss ss si si ss ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* si si si so*}}",
+            root = json_pack("{ss si s{ss si ss ss si si ss ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* ss* si si si so*}}",
                         "status", "ok",
                         "code", 200,
                         "session-info",
@@ -518,6 +518,8 @@ bbl_ctrl_session_info(int fd, bbl_ctx_s *ctx, uint32_t session_id, json_t* argum
                         "username", session->username,
                         "agent-circuit-id", session->agent_circuit_id,
                         "agent-remote-id", session->agent_remote_id,
+                        "reply-message", session->reply_message,
+                        "connection-status-message", session->connections_status_message,
                         "lcp-state", ppp_state_string(session->lcp_state),
                         "ipcp-state", ppp_state_string(session->ipcp_state),
                         "ip6cp-state", ppp_state_string(session->ip6cp_state),

src/bbl_interactive.c

@@ -20,7 +20,7 @@
 typedef enum {
     UI_VIEW_DEFAULT = 0,
     UI_VIEW_ACCESS_IF_STATS,
-    UI_VIEW_STREAMS,
+    UI_VIEW_SESSION,
     UI_VIEW_MAX,
 } __attribute__ ((__packed__)) bbl_ui_view;
 
@@ -49,7 +49,7 @@ bbl_init_stats_win()
     wclear(stats_win);
     wattron(stats_win, COLOR_PAIR(COLOR_GREEN));
     wprintw(stats_win, "F1: Select View  F7/F8: Start/Stop Traffic  F9: Terminate Sessions\n");
-    if(g_view_selected == UI_VIEW_STREAMS) {
+    if(g_view_selected == UI_VIEW_SESSION) {
         wprintw(stats_win, "Left/Right: Select Session\n");
     } else {
         wprintw(stats_win, "Left/Right: Select Interface\n");
@@ -93,7 +93,7 @@ bbl_read_key_job (timer_s *timer)
             bbl_init_stats_win();
             break;
         case KEY_LEFT:
-            if(g_view_selected == UI_VIEW_STREAMS) {
+            if(g_view_selected == UI_VIEW_SESSION) {
                 if(g_session_selected > 1) {
                     g_session_selected--;
                 } else {
@@ -108,7 +108,7 @@ bbl_read_key_job (timer_s *timer)
             bbl_init_stats_win();
             break;
         case KEY_RIGHT:
-            if(g_view_selected == UI_VIEW_STREAMS) {
+            if(g_view_selected == UI_VIEW_SESSION) {
                 g_session_selected++;
                 if(g_session_selected > ctx->sessions) {
                     g_session_selected = 1;
@@ -407,8 +407,8 @@ bbl_stats_job (timer_s *timer)
             wprintw(stats_win, "\nAccess Interface Protocol Stats");
         }
 
-    } else if(g_view_selected == UI_VIEW_STREAMS) {
-        wprintw(stats_win, "\nSession Stream Stats ( Session-Id: ", g_session_selected);
+    } else if(g_view_selected == UI_VIEW_SESSION) {
+        wprintw(stats_win, "\nSession and Streams ( Session-Id: ", g_session_selected);
         wattron(stats_win, COLOR_PAIR(COLOR_GREEN));
         wprintw(stats_win, "%u", g_session_selected);
         wattroff(stats_win, COLOR_PAIR(COLOR_GREEN));
@@ -425,6 +425,15 @@ bbl_stats_job (timer_s *timer)
             if(session->agent_remote_id) {
                 wprintw(stats_win, "       ACI: %s \n", session->agent_circuit_id);
             }
+            if(session->connections_status_message || session->reply_message) {
+                wprintw(stats_win, "\n");
+                if(session->reply_message) {
+                    wprintw(stats_win, "  Reply-Message: %s \n", session->reply_message);
+                }
+                if(session->connections_status_message) {
+                    wprintw(stats_win, "  Connection-Status-Message: %s \n", session->connections_status_message);
+                }
+            }
             wprintw(stats_win, "\n  Access Client Interface\n");
             wprintw(stats_win, "    Tx Packets %10lu | %7lu PPS | %10lu Kbps\n",
                 session->stats.packets_tx, session->stats.rate_packets_tx.avg,

src/bbl_protocols.c

@@ -1816,7 +1816,11 @@ encode_ethernet(uint8_t *buf, uint16_t *len,
 
     /* Add VLAN header */
     if(eth->vlan_outer) {
-        *(uint16_t*)buf = htobe16(ETH_TYPE_VLAN);
+        if(eth->qinq) {
+            *(uint16_t*)buf = htobe16(ETH_TYPE_QINQ);
+        } else {
+            *(uint16_t*)buf = htobe16(ETH_TYPE_VLAN);
+        }
         BUMP_WRITE_BUFFER(buf, len, sizeof(uint16_t));
         eth->vlan_outer |= eth->vlan_outer_priority << 13;
         *(uint16_t*)buf = htobe16(eth->vlan_outer);
@@ -2960,6 +2964,9 @@ decode_ppp_lcp(uint8_t *buf, uint16_t len,
     lcp = (bbl_lcp_t*)sp; BUMP_BUFFER(sp, sp_len, sizeof(bbl_lcp_t));
     memset(lcp, 0x0, sizeof(bbl_lcp_t));
 
+    lcp->start = buf;
+    lcp->len = len;
+
     lcp->code = *buf;
     BUMP_BUFFER(buf, len, sizeof(uint8_t));
     lcp->identifier = *buf;
@@ -2986,6 +2993,20 @@ decode_ppp_lcp(uint8_t *buf, uint16_t len,
     lcp->options_len = lcp_len;
 
     switch(lcp->code) {
+        case PPP_CODE_VENDOR_SPECIFIC:
+            /* RFC 2153 */
+            if(lcp_len < 8) {
+                return DECODE_ERROR;
+            }
+            lcp->magic = *(uint32_t*)buf;
+            BUMP_BUFFER(buf, lcp_len, sizeof(uint32_t));
+            memcpy(lcp->vendor_oui, buf, OUI_LEN);
+            BUMP_BUFFER(buf, lcp_len, OUI_LEN);
+            lcp->vendor_kind = *buf;
+            BUMP_BUFFER(buf, lcp_len, sizeof(uint8_t));
+            lcp->vendor_value = buf;
+            lcp->vendor_value_len = lcp_len;
+            break;
         case PPP_CODE_ECHO_REQUEST:
         case PPP_CODE_ECHO_REPLY:
             if(lcp_len>=4) {

src/bbl_protocols.h

@@ -48,6 +48,8 @@
 #define ETH_VLAN_ID_MAX                 4095
 #define ETH_VLAN_PBIT_MAX               7
 
+#define OUI_LEN                         3 
+
 #define IPV4_RF                         0x8000 /* reserved fragment flag */
 #define IPV4_DF                         0x4000 /* dont fragment flag */
 #define IPV4_MF                         0x2000 /* more fragments flag */
@@ -83,6 +85,7 @@
 #define ICMP_TYPE_ECHO_REPLY            0x00
 #define ICMP_TYPE_ECHO_REQUEST          0x08
 
+#define PPP_CODE_VENDOR_SPECIFIC        0
 #define PPP_CODE_CONF_REQUEST           1
 #define PPP_CODE_CONF_ACK               2
 #define PPP_CODE_CONF_NAK               3
@@ -471,6 +474,7 @@ typedef struct access_line_ {
 typedef struct bbl_ethernet_header_ {
     uint8_t  *dst; // destination MAC address
     uint8_t  *src; // source MAC address
+    bool      qinq; // ethertype 0x88a8
     uint16_t  vlan_outer; // outer VLAN identifier
     uint16_t  vlan_inner; // inner VLAN identifier
     uint16_t  vlan_three; // third VLAN
@@ -532,6 +536,12 @@ typedef struct bbl_lcp_ {
     uint16_t    mru;
     uint16_t    auth;
     uint32_t    magic;
+    uint8_t     vendor_oui[OUI_LEN];
+    uint8_t     vendor_kind;
+    uint8_t    *vendor_value;
+    uint16_t    vendor_value_len;
+    uint8_t    *start;
+    uint16_t    len;
 } bbl_lcp_t;
 
 /*