Changeset 4677

Timestamp:

02/21/07 18:14:56 (2 years ago)

Author:

morris

Message:

Minor P7 fixes

Files:

• libwired/trunk/libwired/p7/wi-p7-message.c (modified) (5 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (1 diff)

libwired/trunk/libwired/p7/wi-p7-message.c

@@ -169 +169 @@
-        uint32_t                        message_size, field_id, field_size;
-
-, fields = (\n
+
-        wi_runtime_class_name(p7_message),
-        p7_message,
@@ -176 +176 @@
-        
-        if(p7_message->serialization == WI_P7_BINARY) {
+                wi_string_append_format(description, WI_STR(", buffer = %@, fields = (\n"),
+                        wi_data_with_bytes_no_copy(p7_message->binary_buffer, p7_message->binary_size, false));
+
-                message_size = p7_message->binary_size - _WI_P7_MESSAGE_BINARY_HEADER_SIZE;
-                buffer = start = p7_message->binary_buffer + _WI_P7_MESSAGE_BINARY_HEADER_SIZE;
@@ -200 +203 @@
-                }
-        } else {
+                wi_string_append_format(description, WI_STR(", xml = %@, fields = (\n"),
+                        p7_message->xml_string);
+
-                if(p7_message->xml_root_node) {
-                        for(node = p7_message->xml_root_node->children; node != NULL; node = node->next) {
@@ -666 +672 @@
-void wi_p7_message_serialize(wi_p7_message_t *p7_message) {
-        if(!p7_message->serialized) {
-
-
-
+
-                        xmlDocDumpMemory(p7_message->xml_doc, &p7_message->xml_buffer, &p7_message->xml_length);
-                }
-                
-                p7_message->serialized = true;
@@ -706 +709 @@
-        if(p7_message->serialization == WI_P7_BINARY) {
-                p7_message->binary_id = wi_p7_spec_message_id(p7_message->spec, p7_message->name);
+                wi_write_swap_host_to_big_int32(p7_message->binary_buffer, 0, p7_message->binary_id);
-        } else {
-                xmlSetProp(p7_message->xml_root_node, (xmlChar *) "name", (xmlChar *) wi_string_cstring(p7_message->name));

libwired/trunk/libwired/p7/wi-p7-socket.c

@@ -517 +517 @@
-        
-        wi_p7_message_set_data_for_name(p7_message, data, WI_STR("p7.encryption.username"));
+        
+        if(!password)
+                password = WI_STR("");
-
-        client_password1 = wi_data_sha1(wi_data_by_appending_data(wi_string_data(wi_string_sha1(password)), rsa));