Merge branch 'rpc_intg1'

3 files changed, 11 insertions, 12 deletions

diff --git a/src/gtest/rpc_test.cpp b/src/gtest/rpc_test.cpp
index 250d5342..6b8e3eff 100644
--- a/src/gtest/rpc_test.cpp
+++ b/src/gtest/rpc_test.cpp
@@ -30,6 +30,8 @@ limitations under the License.
 
 using namespace std;
 
+uint16_t gtest_get_mock_server_port();
+
 class RpcTest : public testing::Test {
 
 protected:
@@ -44,7 +46,12 @@ protected:
          
         m_context = zmq_ctx_new ();
         m_socket = zmq_socket (m_context, ZMQ_REQ);
-        zmq_connect (m_socket, "tcp://localhost:5050");
+
+        std::stringstream ss;
+        ss << "tcp://localhost:";
+        ss << gtest_get_mock_server_port();
+
+        zmq_connect (m_socket, ss.str().c_str());
 
     }
 
diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp
index 0341516c..2bab4dff 100644
--- a/src/gtest/trex_stateless_gtest.cpp
+++ b/src/gtest/trex_stateless_gtest.cpp
@@ -82,7 +82,7 @@ private:
 
 void CTRexDpStreamModeSingleBurst::dump(FILE *fd){
     fprintf (fd," pps           : %f \n",m_pps);
-    fprintf (fd," total_packets : %llu \n",m_total_packets);
+    fprintf (fd," total_packets : %llu \n", (unsigned long long)m_total_packets);
 }
 
 
@@ -130,9 +130,9 @@ private:
 
 void CTRexDpStreamModeMultiBurst::dump(FILE *fd){
     fprintf (fd," pps           : %f \n",m_pps);
-    fprintf (fd," total_packets : %llu \n",m_pkts_per_burst);
+    fprintf (fd," total_packets : %llu \n", (unsigned long long)m_pkts_per_burst);
     fprintf (fd," ibg           : %f \n",m_ibg);
-    fprintf (fd," num_of_bursts : %llu \n",m_number_of_bursts);
+    fprintf (fd," num_of_bursts : %lu \n", (ulong)m_number_of_bursts);
 }
 
 
diff --git a/src/gtest/tuple_gen_test.cpp b/src/gtest/tuple_gen_test.cpp
index 8a774e38..f3b9fa1e 100755
--- a/src/gtest/tuple_gen_test.cpp
+++ b/src/gtest/tuple_gen_test.cpp
@@ -161,7 +161,6 @@ TEST(tuple_gen,clientPoolL) {
                0,0);
     CTupleBase result;
     uint32_t result_src;
-    uint32_t result_dest;
     uint16_t result_port;
 
     for(int i=0;i<10;i++) {
@@ -186,7 +185,6 @@ TEST(tuple_gen,clientPool) {
                0,0);
     CTupleBase result;
     uint32_t result_src;
-    uint32_t result_dest;
     uint16_t result_port;
 
     for(int i=0;i<10;i++) {
@@ -436,7 +434,6 @@ TEST(tuple_gen,template1) {
         template_1.GenerateTuple(result);
         uint32_t result_src = result.getClient();
         uint32_t result_dest = result.getServer();
-        uint16_t result_port = result.getClientPort();
         //printf(" %x %x %x \n",result_src,result_dest,result_port);
         EXPECT_EQ(result_src, (uint32_t)(0x10000001+i));
         EXPECT_EQ(result_dest, (uint32_t)(((0x12121212)) ));
@@ -489,9 +486,6 @@ TEST(tuple_gen,no_free) {
     int i;
     for (i=0; i<65557; i++) {
         template_1.GenerateTuple(result);
-        uint32_t result_src = result.getClient();
-        uint32_t result_dest = result.getServer();
-        uint16_t result_port = result.getClientPort();
     }
     // should have error
     EXPECT_TRUE((gen.getErrorAllocationCounter()>0)?true:false);
@@ -514,8 +508,6 @@ TEST(tuple_gen,try_to_free) {
     int i;
     for (i=0; i<65557; i++) {
         template_1.GenerateTuple(result);
-        uint32_t result_src = result.getClient();
-        uint32_t result_dest = result.getServer();
         uint16_t result_port = result.getClientPort();
         gen.FreePort(0,result.getClientId(),result_port);
     }