Changeset 5251

Timestamp:

02/11/08 14:58:22 (7 months ago)

Author:

morris

Message:

Add some compatibility for clients

Files:

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

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

@@ -57 +57 @@
-
-static wi_string_t *                                                            _wi_p7_message_field_string_value(wi_p7_message_t *, wi_string_t *, wi_p7_type_t);
-wi_p7_type_t, 
+
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_reading_for_name(wi_p7_message_t *, wi_string_t *, unsigned char **, uint32_t *);
+static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_writing_for_id(wi_p7_message_t *, uint32_t, uint32_t, unsigned char **);
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_writing_for_name(wi_p7_message_t *, wi_string_t *, uint32_t, unsigned char **, uint32_t *);
-static void                                                                                     _wi_p7_message_set_xml_field(wi_p7_message_t *, wi_p7_type_t, wi_string_t *, wi_string_t *);
@@ -454 +455 @@
-
-
-wi_p7_type_t in_type_id, 
+
-        unsigned char           *buffer, *start;
-        uint32_t                        message_size, field_id, field_size;
@@ -474 +475 @@
-                }
-                
-
-
+
-                        if(out_buffer)
-                                *out_buffer = buffer;
@@ -505 +505 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        
-        if(length > 0)
@@ -527 +518 @@
-                field_size = wi_p7_spec_field_size(p7_message->spec, field_id);
-        
-0, 
+
-                if(field_size == old_size)
-                        return true;
@@ -545 +536 @@
-                *out_buffer = p7_message->binary_buffer + p7_message->binary_size;
-        
+        p7_message->binary_size += new_size;
+        
+        return true;
+}
+
+
+
+static wi_boolean_t _wi_p7_message_get_binary_buffer_for_writing_for_name(wi_p7_message_t *p7_message, wi_string_t *field_name, uint32_t length, unsigned char **out_buffer, uint32_t *out_field_id) {
+        uint32_t                field_id;
+        
+        field_id = wi_p7_spec_field_id(p7_message->spec, field_name);
+        
+        if(field_id == WI_P7_SPEC_FIELD_ID_NULL) {
+                wi_error_set_libwired_p7_error(WI_ERROR_P7_UNKNOWNFIELD,
+                        WI_STR("No id found for field \"%@\""), field_name);
+                
+                return false;
+        }
+        
-        if(out_field_id)
-                *out_field_id = field_id;
-
-
-
-
+
+
-}
-
@@ -1223 +1231 @@
-                        return NULL;
-                
-
+ - 1
-        } else {
-                string = _wi_p7_message_xml_value_for_name(p7_message, field_name);
@@ -1434 +1442 @@
-                        return NULL;
-                
-
+ - 1
-        } else {
-                string = _wi_p7_message_xml_value_for_name(p7_message, field_name);
@@ -1447 +1455 @@
-}
-
+
+
+#pragma mark -
+
+wi_boolean_t wi_p7_message_write_binary(wi_p7_message_t *p7_message, const void *buffer, uint32_t field_size, wi_uinteger_t field_id) {
+        unsigned char   *binary;
+        
+        if(p7_message->serialization != WI_P7_BINARY)
+                return false;
+        
+        if(!_wi_p7_message_get_binary_buffer_for_writing_for_id(p7_message, field_id, field_size, &binary))
+                return false;
+
+        wi_write_swap_host_to_big_int32(binary, 0, field_id);
+
+        if(wi_p7_spec_field_size(p7_message->spec, field_id) > 0) {
+                memcpy(binary + 4, buffer, field_size);
+        } else {
+                wi_write_swap_host_to_big_int32(binary, 4, field_size);
+                
+                memcpy(binary + 8, buffer, field_size);
+        }
+
+        return true;
+}
+
+
+
+wi_boolean_t wi_p7_message_read_binary(wi_p7_message_t *p7_message, unsigned char **buffer, uint32_t *field_size, wi_uinteger_t field_id) {
+        if(p7_message->serialization != WI_P7_BINARY)
+                return false;
+        
+        return _wi_p7_message_get_binary_buffer_for_reading_for_id(p7_message, field_id, buffer, field_size);
+}
+
-#endif

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

@@ -112 +112 @@
-WI_EXPORT wi_date_t *                           wi_p7_message_date_for_name(wi_p7_message_t *, wi_string_t *);
-
+WI_EXPORT wi_boolean_t                          wi_p7_message_write_binary(wi_p7_message_t *, const void *, uint32_t, wi_uinteger_t);
+WI_EXPORT wi_boolean_t                          wi_p7_message_read_binary(wi_p7_message_t *, unsigned char **, uint32_t *, wi_uinteger_t);
+
-#endif /* WI_P7_MESSAGE_H */

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

@@ -1385 +1385 @@
-
-
+void wi_p7_socket_close(wi_p7_socket_t *p7_socket) {
+}
+
+
+
+#pragma mark -
+
-wi_boolean_t wi_p7_socket_write_message(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout, wi_p7_message_t *p7_message) {
-        wi_boolean_t    result;

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

@@ -74 +74 @@
-WI_EXPORT wi_boolean_t                                                          wi_p7_socket_connect(wi_p7_socket_t *, wi_time_interval_t, wi_p7_options_t, wi_p7_serialization_t, wi_string_t *, wi_string_t *);
-WI_EXPORT wi_boolean_t                                                          wi_p7_socket_accept(wi_p7_socket_t *, wi_time_interval_t, wi_p7_options_t);
+WI_EXPORT void                                                                          wi_p7_socket_close(wi_p7_socket_t *);
+
-WI_EXPORT wi_boolean_t                                                          wi_p7_socket_write_message(wi_p7_socket_t *, wi_time_interval_t, wi_p7_message_t *);
-WI_EXPORT wi_p7_message_t *                                                     wi_p7_socket_read_message(wi_p7_socket_t *, wi_time_interval_t);

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

@@ -1245 +1245 @@
-
-
+wi_hash_t * wi_p7_spec_field_names_for_ids(wi_p7_spec_t *p7_spec) {
+        wi_enumerator_t                 *enumerator;
+        wi_hash_t                               *hash;
+        _wi_p7_spec_field_t             *field;
+        
+        hash = wi_hash_init_with_capacity_and_callbacks(wi_hash_alloc(),
+                wi_hash_count(p7_spec->fields_name), wi_hash_null_key_callbacks, wi_hash_default_value_callbacks);
+        
+        enumerator = wi_hash_data_enumerator(p7_spec->fields_name);
+        
+        while((field = wi_enumerator_next_data(enumerator)))
+                wi_hash_set_data_for_key(hash, field->name, (void *) field->id);
+        
+        if(_wi_p7_spec_builtin_spec) {
+                enumerator = wi_hash_data_enumerator(_wi_p7_spec_builtin_spec->fields_name);
+                
+                while((field = wi_enumerator_next_data(enumerator)))
+                        wi_hash_set_data_for_key(hash, field->name, (void *) field->id);
+        }
+        
+        return wi_autorelease(hash);
+}
+
+
+
-wi_p7_type_t wi_p7_spec_field_type(wi_p7_spec_t *p7_spec, wi_uinteger_t field_id) {
-        _wi_p7_spec_field_t             *field;

libwired/trunk/libwired/p7/wi-p7-spec.h

@@ -56 +56 @@
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_field_id(wi_p7_spec_t *, wi_string_t *);
-WI_EXPORT wi_string_t *                                 wi_p7_spec_field_name(wi_p7_spec_t *, wi_uinteger_t);
+WI_EXPORT wi_hash_t *                                   wi_p7_spec_field_names_for_ids(wi_p7_spec_t *);
-WI_EXPORT wi_p7_type_t                                  wi_p7_spec_field_type(wi_p7_spec_t *, wi_uinteger_t);
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_field_size(wi_p7_spec_t *, wi_uinteger_t);