Feature/typepayload

app/modules/teo_web/teo_ws.c

@@ -35,9 +35,9 @@ static void send_auth_answer(void *nc_p, char* err, char *result);
  */
 #define nc ((struct mg_connection *)nc_p)
 /**
- * Pointer to ksnet_cfg structure
+ * Pointer to teonet_cfg structure
  */
-//#define ksn_conf &((ksnetEvMgrClass*)kws->kh->ke)->ksn_cfg
+//#define ksn_conf &((ksnetEvMgrClass*)kws->kh->ke)->teo_cfg
 #define kev ((ksnetEvMgrClass*)kws->kh->ke)
 /**
  * This module label

app/teogw.c

@@ -47,14 +47,14 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_STARTED:
 
             ksn_printf(ke, "", DEBUG, "Host '%s' started at network '%s'...\n", 
-                    ksnetEvMgrGetHostName(ke), ke->ksn_cfg.network);
+                    ksnetEvMgrGetHostName(ke), ke->teo_cfg.network);
 
             // Set application type
             teoSetAppType(ke, "teo-gw");
             teoSetAppVersion(ke, TGW_VERSION);
 
             // start new network
-            if(!strcmp(ke->ksn_cfg.network,"local")) {
+            if(!strcmp(ke->teo_cfg.network,"local")) {
                 const char* net = "NEW_NET";
                 ksn_printf(ke, "", DEBUG, "Dynamically add new network %s\n", net);
                 teoMultiAddNet(ke->km, event_cb, "NEW_HOST", 0, net, NULL);
@@ -66,14 +66,14 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_CONNECTED: {
             // const ksnCorePacketData *rd = (ksnCorePacketData *) data;
             ksn_printf(ke, "", DEBUG, "Peer '%s' connected at network '%s'...\n", 
-                    rd->from, ke->ksn_cfg.network);
+                    rd->from, ke->teo_cfg.network);
         } break;    
 
         // Show disconnected peers
         case EV_K_DISCONNECTED: {
             // const ksnCorePacketData *rd = (ksnCorePacketData *) data;
             ksn_printf(ke, "", DEBUG, "Peer '%s' disconnected at network '%s'...\n", 
-                    rd->from, ke->ksn_cfg.network);
+                    rd->from, ke->teo_cfg.network);
         } break;
 
 

app/teoweb.c

@@ -134,7 +134,7 @@ int main(int argc, char** argv) {
     teoSetAppVersion(ke, TWEB_VERSION);
 
     // Read teoweb configuration
-    teowebConfigRead(tm.tw_cfg, ke->ksn_cfg.network, ke->ksn_cfg.port);
+    teowebConfigRead(tm.tw_cfg, ke->teo_cfg.network, ke->teo_cfg.port);
 
     // Start teonet
     ksnetEvMgrRun(ke);

examples/fossa/teofossa.c

@@ -156,7 +156,7 @@ int main(int argc, char** argv) {
     //ksnetEvMgrSetCustomTimer(ke, 1.00);
 
     // Hello message
-    ksnet_printf(&ke->ksn_cfg, MESSAGE, "Started...\n\n");
+    ksnet_printf(&ke->teo_cfg, MESSAGE, "Started...\n\n");
 
     // Start teonet
     ksnetEvMgrRun(ke);

examples/teoack.c

@@ -43,7 +43,7 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
             static int idx = 0;
             char buffer[KSN_BUFFER_DB_SIZE];
 
-            char *peer_to = ke->ksn_cfg.app_argv[1]; //"tr-udp-11";
+            char *peer_to = ke->teo_cfg.app_argv[1]; //"tr-udp-11";
             if(strcmp(peer_to, ksnetEvMgrGetHostName(ke))) {
 
                 // If peer_to is connected

examples/teoackm.c

@@ -56,7 +56,7 @@ int app_state = STATE_NONE; ///< Application state
 void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
               size_t data_len, void *user_data) {
 
-    char *peer_to = ke->ksn_cfg.app_argv[1]; 
+    char *peer_to = ke->teo_cfg.app_argv[1]; 
 
     switch(event) {
 
@@ -270,11 +270,11 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
                         // Show DATA - stop TR-UDP statistic
                         if(show_data_or_statistic_at_server) {
 
-                            ke->ksn_cfg.show_tr_udp_f = 0;
+                            ke->teo_cfg.show_tr_udp_f = 0;
                         }
                         //Show Statistic - start TR-UDP statistic
                         else {
-                            ke->ksn_cfg.show_tr_udp_f = 1;
+                            ke->teo_cfg.show_tr_udp_f = 1;
                         }
                     }
                 }    

examples/teocque.c

@@ -157,7 +157,7 @@ int main(int argc, char** argv) {
     ksnetEvMgrSetCustomTimer(ke, 2.00);
 
     // Show Hello message
-    ksnet_printf(&ke->ksn_cfg, MESSAGE, "Example started...\n\n");
+    ksnet_printf(&ke->teo_cfg, MESSAGE, "Example started...\n\n");
 
     // Start teonet
     ksnetEvMgrRun(ke);    

examples/teodb_ex.c

@@ -23,7 +23,7 @@
 #define TDB_VERSION "0.0.1"
 #define APPNAME _ANSI_MAGENTA "teodb_ex" _ANSI_NONE
 
-#define TEODB_PEER ke->ksn_cfg.app_argv[1]
+#define TEODB_PEER ke->teo_cfg.app_argv[1]
 
 #define TEODB_EX_KEY "teo_db_ex"
 #define TEST_KEY "test"

examples/teodb_ex_cpp.cpp

@@ -21,7 +21,7 @@
 #define TDB_VERSION "0.0.2"
 #define APPNAME _ANSI_MAGENTA "teodb_ex" _ANSI_NONE
 
-#define TEODB_PEER teo.getKe()->ksn_cfg.app_argv[1]
+#define TEODB_PEER teo.getKe()->teo_cfg.app_argv[1]
 #define TEODB_EX_KEY "teo_db_ex"
 #define TEST_KEY "test"
 #define TEST_VALUE "{ \"name\": \"1\" }"

examples/teodb_ex_cpp_2.cpp

@@ -22,7 +22,7 @@
 #define TDB_VERSION "0.0.2"
 #define APPNAME _ANSI_MAGENTA "teodb_ex" _ANSI_NONE
 
-#define TEODB_PEER getKe()->ksn_cfg.app_argv[1]
+#define TEODB_PEER getKe()->teo_cfg.app_argv[1]
 #define TEODB_EX_KEY "teo_db_ex"
 #define TEST_KEY "test"
 #define TEST_VALUE "{ \"name\": \"1\" }"

examples/teol0cli.c

@@ -50,7 +50,7 @@ void tcp_read_cb(struct ev_loop *loop, struct ev_io *w, int revents) {
             case CMD_ECHO_ANSWER:
             {    
                 char *data = sp->peer_name + sp->peer_name_length;
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Receive %d bytes CMD_ECHO_ANSWER: %d bytes data from L0 server, "
                     "from peer %s, data: %s\n", 
                     (int)rc, sp->data_length, sp->peer_name, data);
@@ -60,7 +60,7 @@ void tcp_read_cb(struct ev_loop *loop, struct ev_io *w, int revents) {
             case CMD_PEERS_ANSWER:
             {    
                 ksnet_arp_data_ar *data_ar = (void*) (sp->peer_name + sp->peer_name_length);
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Receive %d bytes CMD_PEERS_ANSWER: %d bytes data from L0 server, "
                     "from peer %s, data rows: %d\n", 
                     (int)rc, sp->data_length, sp->peer_name, data_ar->length);
@@ -80,7 +80,7 @@ void tcp_read_cb(struct ev_loop *loop, struct ev_io *w, int revents) {
             } break;
 
             default:
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Receive %d bytes UNKNOWN_COMMAND %d: %d bytes data from L0 server, "
                     "from peer %s\n", 
                     (int)rc, sp->cmd, sp->data_length, sp->peer_name);
@@ -110,8 +110,8 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_STARTED:
         {
             // Connect to L0 Server
-            fd = ksnTcpClientCreate(ke->kt, atoi(ke->ksn_cfg.app_argv[2]), 
-                    ke->ksn_cfg.app_argv[1]);
+            fd = ksnTcpClientCreate(ke->kt, atoi(ke->teo_cfg.app_argv[2]), 
+                    ke->teo_cfg.app_argv[1]);
 
             if(fd > 0) {
 
@@ -135,27 +135,27 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
                 size_t pkg_length = teoLNullPacketCreateLogin(packet, KSN_BUFFER_SIZE, 
                         host_name);
                 if((snd = write(fd, pkg, pkg_length)) >= 0);
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Send %d bytes initialize packet to L0 server\n", (int)snd);
 
                 // Send get peers request to peer
-                char *peer_name = ke->ksn_cfg.app_argv[3]; // Peer name 
+                char *peer_name = ke->teo_cfg.app_argv[3]; // Peer name 
                 pkg_length = teoLNullPacketCreate(packet, KSN_BUFFER_SIZE, 
                         CMD_PEERS, peer_name, NULL, 0);
                 //if((snd = write(fd, pkg, pkg_length)) >= 0);
                 if((snd = teoLNullPacketSend(fd, false, pkg, pkg_length)) >= 0);
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Send %d bytes packet to L0 server to peer %s, cmd = %d\n", 
                     (int)snd, peer_name, CMD_PEERS);
 
                 // Send echo request to peer
-                peer_name = ke->ksn_cfg.app_argv[3];    // Peer name 
-                char *msg = ke->ksn_cfg.app_argv[4];    // Message
+                peer_name = ke->teo_cfg.app_argv[3];    // Peer name 
+                char *msg = ke->teo_cfg.app_argv[4];    // Message
                 pkg_length = teoLNullPacketCreate(packet, KSN_BUFFER_SIZE, 
                         CMD_ECHO, peer_name, msg, strlen(msg) + 1);
                 //if((snd = write(fd, pkg, pkg_length)) >= 0);
                 if((snd = teoLNullPacketSend(fd, false, pkg, pkg_length)) >= 0);
-                ksnet_printf(&ke->ksn_cfg, DEBUG,
+                ksnet_printf(&ke->teo_cfg, DEBUG,
                     "Send %d bytes packet to L0 server to peer %s, cmd = %d, data: %s\n", 
                     (int)snd, peer_name, CMD_ECHO, msg);
             }

examples/teolarge.c

@@ -94,7 +94,7 @@ int main(int argc, char** argv) {
     ksnetEvMgrSetCustomTimer(ke, 1.00);
 
     // Hello message
-    ksnet_printf(&ke->ksn_cfg, MESSAGE, "Started...\n\n");
+    ksnet_printf(&ke->teo_cfg, MESSAGE, "Started...\n\n");
 
     // Start teonet
     ksnetEvMgrRun(ke);

examples/teomulti_t.c

@@ -60,7 +60,7 @@ void* teonet_t(void *teo) {
     // Set network parameters
     ke->net_idx = teonet->n_num; // Set network number
     ke->net_count = teonet->num_nets; // Set number of networks
-    strcpy(ke->ksn_cfg.host_name, teonet->name); // Set host name
+    strcpy(ke->teo_cfg.host_name, teonet->name); // Set host name
     ke->n_prev = teonet->n_prev; // Pointer to previous network
     ke->n_next = teonet->n_next; // Pointer to next network
     teonet->ke = ke; // Set pointer to event manager

examples/teosend.c

@@ -116,7 +116,7 @@ int main(int argc, char** argv) {
     ksnetEvMgrSetCustomTimer(ke, 1.00);
 
     // Hello message
-    ksnet_printf(&ke->ksn_cfg, MESSAGE, "Started...\n\n");
+    ksnet_printf(&ke->teo_cfg, MESSAGE, "Started...\n\n");
 
     // Start teonet
     ksnetEvMgrRun(ke);

examples/teosscr.c

@@ -73,7 +73,7 @@ void event_cb_client(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         {
             // Client send subscribe command to server                
             char *peer = ((ksnCorePacketData*)data)->from;
-            if(!strcmp(peer, ke->ksn_cfg.app_argv[1])) {
+            if(!strcmp(peer, ke->teo_cfg.app_argv[1])) {
 
                 printf("The peer: '%s' was connected\n", peer);
 
@@ -88,7 +88,7 @@ void event_cb_client(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_TIMER:
         {
             // Client send CMD_USER command to server
-            ksnCoreSendCmdto(ke->kc, ke->ksn_cfg.app_argv[1], CMD_USER, 
+            ksnCoreSendCmdto(ke->kc, ke->teo_cfg.app_argv[1], CMD_USER, 
                         "Hello!", 7);
         }
         break;
@@ -195,10 +195,10 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
             printf("Type of this application: "); 
 
             // Client
-            if(strcmp(ke->ksn_cfg.app_argv[1], "null")) {
+            if(strcmp(ke->teo_cfg.app_argv[1], "null")) {
 
                 printf("Client peer subscribed to '%s' peer\n", 
-                        ke->ksn_cfg.app_argv[1]);       
+                        ke->teo_cfg.app_argv[1]);       
 
                 app_type = 0;
             }

examples/teostream.c

@@ -47,16 +47,16 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         {
             if(data != NULL) {
 
-                if(!strcmp(((ksnCorePacketData*)data)->from, ke->ksn_cfg.app_argv[1])) {
+                if(!strcmp(((ksnCorePacketData*)data)->from, ke->teo_cfg.app_argv[1])) {
 
                     printf("Peer \"%s\" was connected\n", ((ksnCorePacketData*)data)->from);
 
                     printf("Create stream name \"%s\" with peer \"%s\" ...\n",  
-                        ke->ksn_cfg.app_argv[2], ke->ksn_cfg.app_argv[1]); 
+                        ke->teo_cfg.app_argv[2], ke->teo_cfg.app_argv[1]); 
 
                     // Send create stream request
-                    ksnStreamCreate(ke->ks, ke->ksn_cfg.app_argv[1], 
-                        ke->ksn_cfg.app_argv[2],  CMD_ST_CREATE);
+                    ksnStreamCreate(ke->ks, ke->teo_cfg.app_argv[1], 
+                        ke->teo_cfg.app_argv[2],  CMD_ST_CREATE);
                 }
 
             }

examples/teotcp.c

@@ -139,10 +139,10 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_STARTED:
         {
             // Type of application (client or server)
-            printf("Type of application: %s\n",  ke->ksn_cfg.app_argv[1]); 
+            printf("Type of application: %s\n",  ke->teo_cfg.app_argv[1]); 
 
             // Server
-            if(!strcmp(ke->ksn_cfg.app_argv[1], "server")) {
+            if(!strcmp(ke->teo_cfg.app_argv[1], "server")) {
 
                 // Start TCP server
                 int port_created;
@@ -151,7 +151,7 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
             }
 
             //Client
-            else if(!strcmp(ke->ksn_cfg.app_argv[1], "client")) {
+            else if(!strcmp(ke->teo_cfg.app_argv[1], "client")) {
                 printf("Client mode example is under construction yet,\n"
                        "trying system telnet application ...\n"); 
                 char *buffer = ksnet_formatMessage("telnet 0 %d", SERVER_PORT);

examples/teotru_load.c

@@ -65,7 +65,7 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
         case EV_K_STARTED:
         {
             // Server mode
-            if(!ke->ksn_cfg.app_argv[1][0] || !strcmp(ke->ksn_cfg.app_argv[1], "server")) {
+            if(!ke->teo_cfg.app_argv[1][0] || !strcmp(ke->teo_cfg.app_argv[1], "server")) {
 
                 printf("Server mode application started\n");
                 printf("Wait for client connected ...\n");
@@ -76,7 +76,7 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
             else {
 
                 printf("Client mode application started ...\n");
-                printf("Wait connection to server \"%s\" ...\n", ke->ksn_cfg.app_argv[1]);
+                printf("Wait connection to server \"%s\" ...\n", ke->teo_cfg.app_argv[1]);
                 app_mode = 0;
             }
 
@@ -89,7 +89,7 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
             if(app_mode == 0) {
                 if(start_test_01) {
                     start_test_01 = 0;
-                    test_01(ke, ke->ksn_cfg.app_argv[1]);
+                    test_01(ke, ke->teo_cfg.app_argv[1]);
                 }
             }
         } break;
@@ -102,10 +102,10 @@ void event_cb(ksnetEvMgrClass *ke, ksnetEvMgrEvents event, void *data,
                     rd->from, rd->addr, rd->port);
 
             // Client mode
-            if(!strcmp(rd->from, ke->ksn_cfg.app_argv[1])) {
+            if(!strcmp(rd->from, ke->teo_cfg.app_argv[1])) {
                 printf("Connected to server \"%s\" ...\n\n"
                        "Press A to start/stop \"Test 01\"\n\n",
-                        ke->ksn_cfg.app_argv[1]);
+                        ke->teo_cfg.app_argv[1]);
             }
 
         } break;

src/Makefile.am

@@ -94,6 +94,7 @@ nobase_teonetinclude_HEADERS = \
     net_multi.h \
     net_recon.h \
     net_split.h \
+    commands_creator.h \
     tr-udp.h \
     tr-udp_stat.h \
     pidfile.h \
@@ -199,6 +200,7 @@ libteonet_la_SOURCES = \
     net_multi.c \
     net_recon.c \
     net_split.c \
+    commands_creator.c \
     tr-udp.c \
     tr-udp_stat.c \
     pidfile.c \