add cmd connect

src/commands_creator.c

@@ -19,23 +19,19 @@ uint8_t* createCmdConnectRPacketUdp(ksnetEvMgrClass *event_manager, size_t *size
     packet->ip_counts = 0;
     packet->port = event_manager->kc->port;
 
-    const char* type = teoGetAppType(event_manager);
-
     size_t hid_len;
     host_info_data *hid = teoGetHostInfo(event_manager, &hid_len);
 
-    if(hid != NULL) {
-        char* full_type = teoGetFullAppTypeFromHostInfo(hid);
-        strncpy(packet->type, full_type, sizeof(packet->type));
-        free(hid);
-    } else {
-        strncpy(packet->type, type, sizeof(packet->type));
-    }
+    char *full_type = teoGetFullAppTypeFromHostInfo(hid);
+    strncpy(packet->type, full_type, sizeof(packet->type));
+    free(hid);
+    free(full_type);
+
 
     size_t ptr = 0;
 
     // Fill data with IPs and Port
-    for(int i=0; i < len; i++) {
+    for(int i = 0; i < len; i++) {
         if(ip_is_private(ips[i])) {
             int ip_len =  strlen(ips[i]) + 1;
             memcpy(packet->ips + ptr, ips[i], ip_len);
@@ -52,11 +48,35 @@ uint8_t* createCmdConnectRPacketUdp(ksnetEvMgrClass *event_manager, size_t *size
 
 
 uint8_t* createCmdConnectRPacketTcp(ksnetEvMgrClass *event_manager, size_t *size_out) {
+    (void)event_manager;
     // Create data with empty list of local IPs and port
-    uint8_t* packet = malloc(sizeof(uint8_t));
+    uint8_t *packet = malloc(sizeof(uint8_t));
     uint8_t *num = (uint8_t *) packet; // Pointer to number of IPs
     *size_out = sizeof(uint8_t); // Pointer (to first IP)
     *num = 0; // Number of IPs
 
-    return packet;
+    return (uint8_t*)packet;
+}
+
+
+uint8_t* createCmdConnectPacket(ksnetEvMgrClass *event_manager, char *name, char *addr, uint32_t port, size_t *size_out) {
+    size_t hid_len;
+    host_info_data *hid = teoGetHostInfo(event_manager, &hid_len);
+
+    char *full_type = teoGetFullAppTypeFromHostInfo(hid);
+
+    *size_out = strlen(name) + 1 + strlen(full_type) + 1 + strlen(addr) + 1 + sizeof(uint32_t);
+    uint8_t *packet = malloc(*size_out);
+    memset(packet, '\0', *size_out);
+
+    size_t ptr = 0;
+    memcpy(packet,       name,      strlen(name)); ptr = strlen(name) + 1;
+    memcpy(packet + ptr, addr,      strlen(addr)); ptr += strlen(addr) + 1;
+    memcpy(packet + ptr, full_type, strlen(full_type)); ptr += strlen(full_type) + 1;
+    *((uint32_t *)(packet + ptr)) = port;
+
+    free(hid);
+    free(full_type);
+
+    return (uint8_t *)packet;
 }

src/commands_creator.h

@@ -21,16 +21,10 @@ typedef struct connect_r_packet {
     char        ips[];
 } connect_r_packet_t;
 
-typedef struct connect_packet {
-    uint32_t    port;   ///< Peer port
-    char        *name;  ///< Peer name
-    char        *addr;  ///< Peer IP address
-} connect_packet_t;
-
-#pragma pack(pop)
+ #pragma pack(pop)
 
 uint8_t* createCmdConnectRPacketUdp(ksnetEvMgrClass *event_manager, size_t *size_out);
 uint8_t* createCmdConnectRPacketTcp(ksnetEvMgrClass *event_manager, size_t *size_out);
-uint8_t* createCmdConnectPacket(ksnetEvMgrClass *event_manager, size_t *size_out);
+uint8_t* createCmdConnectPacket(ksnetEvMgrClass *event_manager, char *name, char *addr, uint32_t port, size_t *size_out);
 
 #endif