commit 897f5ab6d13999a80be3d0f2dc5d423603da7d80
author Girish Gowdra <girish@opennetworking.org> Thu Oct 17 17:05:31 2019 +0530
committer Girish Gowdra <girish@opennetworking.org> Fri Oct 18 13:34:19 2019 +0530
tree 9db51b2928a8d46ca83ef498d4e2cbe53d5c9751
parent d18f0d36c31a685a6153b11e1966b8c6533d19d6

VOL-1941: Use protobufs from the voltha-protos repo, not a copy

- Use protobufs from the voltha-protos repo, not a copy
- Provided option to specify the openolt proto version via make option
- Removed duplicate README.md

Change-Id: Id67714c8119521f8358aaa9245268c47b7e843cf

agent/src/core.cc

diff --git a/agent/src/core.cc b/agent/src/core.cc
index 9c27296..c1a381a 100644
--- a/agent/src/core.cc
+++ b/agent/src/core.cc
@@ -1629,11 +1629,14 @@
     return Status::OK;
 }
 
-Status UplinkPacketOut_(uint32_t intf_id, const std::string pkt, bcmolt_flow_id flow_id) {
+Status UplinkPacketOut_(uint32_t intf_id, const std::string pkt) {
     bcmolt_flow_key key = {}; /* declare key */
     bcmolt_bin_str buffer = {};
     bcmolt_flow_send_eth_packet oper; /* declare main API struct */
 
+    // TODO: flow_id is currently not passed in UplinkPacket message from voltha.
+    bcmolt_flow_id flow_id = 0;
+
     //validate flow_id and find flow_id/flow type: upstream/ingress type: PON/egress type: NNI
     if (get_flow_status(flow_id, BCMOLT_FLOW_TYPE_UPSTREAM, FLOW_TYPE) == BCMOLT_FLOW_TYPE_UPSTREAM && \
         get_flow_status(flow_id, BCMOLT_FLOW_TYPE_UPSTREAM, INGRESS_INTF_TYPE) == BCMOLT_FLOW_INTERFACE_TYPE_PON && \
@@ -1651,8 +1654,9 @@
                 }
             }
         }
-        else
+        else {
             return grpc::Status(grpc::StatusCode::NOT_FOUND, "no flow id found");
+        }
     }
 
     key.flow_type = BCMOLT_FLOW_TYPE_UPSTREAM; /* send from uplink direction */
@@ -1664,16 +1668,16 @@
     buffer.arr = (uint8_t *)malloc((buffer.len)*sizeof(uint8_t));
     memcpy(buffer.arr, (uint8_t *)pkt.data(), buffer.len);
     if (buffer.arr == NULL) {
-        OPENOLT_LOG(ERROR, openolt_log_id, "allocate pakcet buffer failed\n");
-        return bcm_to_grpc_err(BCM_ERR_PARM, "allocate pakcet buffer failed");
+        OPENOLT_LOG(ERROR, openolt_log_id, "allocate packet buffer failed\n");
+        return bcm_to_grpc_err(BCM_ERR_PARM, "allocate packet buffer failed");
     }
     BCMOLT_FIELD_SET(&oper.data, flow_send_eth_packet_data, buffer, buffer);
 
     bcmos_errno err = bcmolt_oper_submit(dev_id, &oper.hdr);
     if (err) {
-        OPENOLT_LOG(ERROR, openolt_log_id, "Error sending packets to port %d, flow_id %d, err %d\n", intf_id, key.flow_id, err);
+        OPENOLT_LOG(ERROR, openolt_log_id, "Error sending packets via nni port %d, flow_id %d err %d\n", intf_id, key.flow_id, err);
     } else {
-        OPENOLT_LOG(INFO, openolt_log_id, "sent packets to port %d in upstream direction (flow_id %d)\n", intf_id, key.flow_id);
+        OPENOLT_LOG(INFO, openolt_log_id, "sent packets to port %d in upstream direction, flow_id %d \n", intf_id, key.flow_id);
     }
 
     return Status::OK;