Procházet zdrojové kódy

cmRtNet.h/c: More changes to cmRtNetTest().

master
kevin před 11 roky
rodič
revize
19ec97b2b4
2 změnil soubory, kde provedl 9 přidání a 8 odebrání
  1. 8
    7
      cmRtNet.c
  2. 1
    1
      cmRtNet.h

+ 8
- 7
cmRtNet.c Zobrazit soubor

759
 
759
 
760
 
760
 
761
 //==========================================================================
761
 //==========================================================================
762
+#include "cmThread.h"
762
 
763
 
763
 typedef struct
764
 typedef struct
764
 {
765
 {
768
 
769
 
769
 void _cmRtNetTestRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr )
770
 void _cmRtNetTestRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr )
770
 {
771
 {
771
-  _cmRtNetTest_t* p = (_cmrtNetTest_t*)cbArg;
772
+  _cmRtNetTest_t* p = (_cmRtNetTest_t*)cbArg;
772
 
773
 
773
   if( cmRtNetIsSyncModeMsg(data,dataByteCnt))
774
   if( cmRtNetIsSyncModeMsg(data,dataByteCnt))
774
     cmRtNetSyncModeRecv(p->netH,data,dataByteCnt,fromAddr);
775
     cmRtNetSyncModeRecv(p->netH,data,dataByteCnt,fromAddr);
778
 
779
 
779
 bool _cmRtNetTestThreadFunc(void* param)
780
 bool _cmRtNetTestThreadFunc(void* param)
780
 {
781
 {
781
-  _cmrtNetTest_t* p = (_cmRtNetTest_t*)param;
782
+  _cmRtNetTest_t* p = (_cmRtNetTest_t*)param;
782
 
783
 
783
   
784
   
784
   if( cmRtNetIsValid(p->netH) && cmRtNetIsInSyncMode(p->netH) )
785
   if( cmRtNetIsValid(p->netH) && cmRtNetIsInSyncMode(p->netH) )
787
   return true;
788
   return true;
788
 }
789
 }
789
 
790
 
790
-void    cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
791
+void  cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
791
 {
792
 {
792
   char c;
793
   char c;
793
   _cmRtNetTest_t t;
794
   _cmRtNetTest_t t;
799
   if( cmThreadCreate(&p->thH,_cmRtNetTestThreadFunc,p,&ctx->rpt) != kOkThRC )
800
   if( cmThreadCreate(&p->thH,_cmRtNetTestThreadFunc,p,&ctx->rpt) != kOkThRC )
800
     goto errLabel;
801
     goto errLabel;
801
 
802
 
802
-  if((rc = cmRtNetAlloc(ctx,&p->netH,p)) != kOkNetRC )
803
+  if((rc = cmRtNetAlloc(ctx,&p->netH,_cmRtNetTestRecv,p)) != kOkNetRC )
803
     goto errLabel;
804
     goto errLabel;
804
 
805
 
805
   if((rc = cmRtNetCreateNode(p->netH, "local", NULL, port )) != kOkNetRC)
806
   if((rc = cmRtNetCreateNode(p->netH, "local", NULL, port )) != kOkNetRC)
807
 
808
 
808
   if( mstrFl )
809
   if( mstrFl )
809
   {
810
   {
810
-    if((rc = cmRtNetCreate(p->netH,"whirl", "192.168.15.109", port )) != kOkNetRC )
811
+    if((rc = cmRtNetCreateNode(p->netH,"whirl", "192.168.15.109", port )) != kOkNetRC )
811
       goto errLabel;
812
       goto errLabel;
812
 
813
 
813
-    if((rc = cmRtNetEndPoint(p->netH,"thunk_ep0", 0 )) != kOkNetRC )
814
+    if((rc = cmRtNetRegisterEndPoint(p->netH,"thunk_ep0", 0 )) != kOkNetRC )
814
       goto errLabel;
815
       goto errLabel;
815
 
816
 
816
     if(( rc = cmRtNetBeginSyncMode(p->netH)) != kOkNetRC )
817
     if(( rc = cmRtNetBeginSyncMode(p->netH)) != kOkNetRC )
819
   }
820
   }
820
   else
821
   else
821
   {
822
   {
822
-    if((rc = cmRtNetEndPoint(p->netH,"whirl_ep0", 0 )) != kOkNetRC )
823
+    if((rc = cmRtNetRegisterEndPoint(p->netH,"whirl_ep0", 0 )) != kOkNetRC )
823
       goto errLabel;
824
       goto errLabel;
824
   }
825
   }
825
   
826
   

+ 1
- 1
cmRtNet.h Zobrazit soubor

87
 
87
 
88
   void      cmRtNetReport( cmRtNetH_t h );
88
   void      cmRtNetReport( cmRtNetH_t h );
89
     
89
     
90
-  void      cmRtNetTest( cmCtx_t* ctx );
90
+  void      cmRtNetTest( cmCtx_t* ctx, bool mstrFl );
91
 
91
 
92
   /*
92
   /*
93
     Master:
93
     Master:

Načítá se…
Zrušit
Uložit