Changeset 451

Timestamp:

05/11/04 02:48:09 (5 years ago)

Author:

morris

Message:

add messaging between hotline and wired users

Files:

• wired/trunk/wired/hotline.c (modified) (5 diffs)
• wired/trunk/wired/server.c (modified) (2 diffs)

wired/trunk/wired/hotline.c

@@ -1 @@
-4 2004/05/05 20:00:48
+5 2004/05/11 00:48:09
-
-/*
@@ -318 +318 @@
-                hl_id = transaction.id;
-                
-                wd_log(LOG_INFO, "transaction.type = %d", transaction.type);
-
-                switch(transaction.type) {
-                        case 101:
@@ -333 +331 @@
-                        case 107:
-                                if(hl_cmd_login() < 0)
+                                        goto close;
+                                break;
+                        
+                        case 108:
+                                if(hl_cmd_msg() < 0)
-                                        goto close;
-                                break;
@@ -682 +685 @@
-        
-        return 1;
+}
+
+
+
+int hl_cmd_msg(void) {
+        struct hl_client                *client = (struct hl_client *) pthread_getspecific(hl_client_key);
+        struct hl_parameters    parameters;
+        struct hl_field                 field;
+        unsigned char                   msg[8192];
+        unsigned int                    uid = 0;
+        int                                             i;
+        
+        /* read parameter count */
+        if(hl_read_parameters(&parameters) < 0)
+                return -1;
+        
+        /* read parameters */
+        for(i = 0; i < parameters.count; i++) {
+                if(hl_read_field(&field) < 0)
+                        return -1;
+                
+                if(hl_read_buffer(client->buffer, field.size) < 0)
+                        return -1;
+                
+                switch(field.id) {
+                        case 101:
+                                strlcpy(msg, client->buffer, sizeof(msg));
+                                break;
+                                
+                        case 103:
+                                if(field.size == 4)
+                                        uid = htonl(hl_get_long(client->buffer));
+                                else if(field.size == 2)
+                                        uid = htons(hl_get_short(client->buffer));
+                                break;
+                }
+        }
+        
+        hl_wd_relay_msg(client, uid, msg);
-}
-
@@ -1381 +1423 @@
-
-
+void hl_wd_relay_msg(struct hl_client *peer, unsigned int uid, char *buffer) {
+        struct wd_client                *wd_client;
+        struct hl_client                *hl_client;
+        unsigned char                   data[2];
+        unsigned int                    length, nicklength;
+        
+        /* get lengths */
+        length = strlen(buffer);
+        nicklength = strlen(peer->nick);
+
+        /* get clients */
+        hl_client = hl_get_client(uid);
+        wd_client = wd_get_client(uid, 1);
+        
+        if(hl_client) {
+                /* send message header */
+                hl_send_transaction(hl_client->sd, 0, 104, 1, 0, 16 + nicklength + length);
+                hl_send_parameters(hl_client->sd, 3);
+
+                /* send uid */
+                hl_send_field(hl_client->sd, 103, 2);
+                hl_set_short(data, peer->uid);
+                hl_send_buffer(hl_client->sd, data, sizeof(data));
+
+                /* send nick */
+                hl_send_field(hl_client->sd, 102, nicklength);
+                hl_send_buffer(hl_client->sd, peer->nick, nicklength);
+
+                /* send buffer */
+                hl_send_field(hl_client->sd, 101, length);
+                hl_send_buffer(hl_client->sd, buffer, length);
+        }
+        else if(wd_client) {
+                /* convert msg */
+                hl_convert_buffer(hl_conv_to, buffer, length);
+        
+                /* send message */
+                pthread_mutex_lock(&(wd_client->ssl_mutex));
+                wd_sreply(wd_client->ssl, 305, "%lu%s%s",
+                        peer->uid,
+                        WD_FIELD_SEPARATOR,
+                        buffer);
+                pthread_mutex_unlock(&(wd_client->ssl_mutex));
+        }
+}
+
+
+
+void wd_hl_relay_msg(unsigned int fromuid, unsigned touid, char *nick, char *msg) {
+        struct hl_client        *hl_client;
+        unsigned char           data[2];
+        unsigned int            length, nicklength;
+        
+        /* convert */
+        hl_convert_buffer(hl_conv_from, nick, nicklength);
+        hl_convert_buffer(hl_conv_from, msg, length);
+        
+        /* get lengths */
+        length = strlen(msg);
+        nicklength = strlen(nick);
+        
+        /* get client */
+        hl_client = hl_get_client(touid);
+        
+        if(hl_client) {
+                /* send message header */
+                hl_send_transaction(hl_client->sd, 0, 104, 1, 0, 16 + nicklength + length);
+                hl_send_parameters(hl_client->sd, 3);
+
+                /* send uid */
+                hl_send_field(hl_client->sd, 103, 2);
+                hl_set_short(data, fromuid);
+                hl_send_buffer(hl_client->sd, data, sizeof(data));
+
+                /* send nick */
+                hl_send_field(hl_client->sd, 102, nicklength);
+                hl_send_buffer(hl_client->sd, nick, nicklength);
+
+                /* send buffer */
+                hl_send_field(hl_client->sd, 101, length);
+                hl_send_buffer(hl_client->sd, msg, length);
+        }
+}
+
+
+
-void hl_wd_relay_nick(struct hl_client *peer) {
-        struct wd_list_node             *client_node;

wired/trunk/wired/server.c

@@ -1 @@
-9 2004/05/09 14:47:26
+10 2004/05/11 00:48:09
-
-/*
@@ -934 +934 @@
-                                                                                 kCFStringEncodingUTF8);
-
- 
- 
+ 
+
-
-                CFNetServiceRegister(wd_net_service, NULL);