Fixed tor.p4 counters

Now defined at top level ingress/egress control

Change-Id: I808de9aed83007db9e03be99f3651777363db36f
diff --git a/tools/test/p4src/tor/tor.p4 b/tools/test/p4src/tor/tor.p4
index 33ebfcd..9f46047 100644
--- a/tools/test/p4src/tor/tor.p4
+++ b/tools/test/p4src/tor/tor.p4
@@ -17,7 +17,13 @@
 control ingress_tor(inout parsed_packet_t hdr,
                     inout local_metadata_t local_metadata,
                     inout standard_metadata_t standard_metadata) {
+  // L123-DEMO-HACK: BEGIN
+  counter(511, CounterType.packets_and_bytes) ingress_port_counter;
+  // L123-DEMO-HACK: END
   apply {
+    // L123-DEMO-HACK: BEGIN
+    ingress_port_counter.count((bit<32>) standard_metadata.ingress_port);
+    // L123-DEMO-HACK: END
     if (hdr.packet_out.isValid()) {
       packetio_ingress.apply(hdr, local_metadata, standard_metadata);
     }
@@ -31,7 +37,13 @@
 control egress_tor(inout parsed_packet_t hdr,
                    inout local_metadata_t local_metadata,
                    inout standard_metadata_t standard_metadata) {
+  // L123-DEMO-HACK: BEGIN
+  counter(511, CounterType.packets_and_bytes) egress_port_counter;
+  // L123-DEMO-HACK: END
   apply {
+    // L123-DEMO-HACK: BEGIN
+    egress_port_counter.count((bit<32>) standard_metadata.egress_port);
+    // L123-DEMO-HACK: END
     packetio_egress.apply(hdr, local_metadata, standard_metadata);
     spoof_protection.apply(hdr, local_metadata, standard_metadata);
   }