Changeset 4696

Timestamp:

02/23/07 17:10:29 (2 years ago)

Author:

morris

Message:

Do away with spec ids, use a name and a version number together instead

Files:

• libwired/trunk/Makefile.in (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-message.c (modified) (5 diffs)
• libwired/trunk/libwired/p7/wi-p7-private.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (8 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (12 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)
• libwired/trunk/test/tests/wi-p7-spec-tests.c (modified) (2 diffs)

libwired/trunk/Makefile.in

@@ -107 +107 @@
-clean:
-        rm -f $(objdir)/libwired/*.o
+        rm -f $(objdir)/libwired/*.d
-        rm -f $(headerdir)/*.h
-        rm -f $(rundir)/lib/libwired.a

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

@@ -1108 +1108 @@
-        uint32_t                field_size, field_id;
-        
+        if(!string)
+                string = WI_STR("");
+        
-        if(p7_message->serialization == WI_P7_BINARY) {
-                field_size = wi_string_length(string) + 1;
@@ -1153 +1156 @@
-        uint32_t                field_size, field_id;
-        
+        if(!data)
+                data = wi_data();
+        
-        if(p7_message->serialization == WI_P7_BINARY) {
-                field_size = wi_data_length(data);
@@ -1195 +1201 @@
-
-wi_boolean_t wi_p7_message_set_number_for_name(wi_p7_message_t *p7_message, wi_number_t *number, wi_string_t *field_name) {
+        if(!number)
+                number = wi_number_with_int32(0);
+        
-        if(wi_number_type(number) == WI_NUMBER_BOOL) {
-                return wi_p7_message_set_bool_for_name(p7_message, wi_number_bool(number), field_name);
@@ -1270 +1279 @@
-        uint32_t                field_id;
-        
+        if(!uuid)
+                return false;
+        
-        if(p7_message->serialization == WI_P7_BINARY) {
-                if(!_wi_p7_message_get_binary_buffer_for_writing_for_name(p7_message, field_name, 0, &binary, &field_id))
@@ -1316 +1328 @@
-        uint32_t                field_id, field_size;
-        
+        if(!date)
+                date = wi_date();
+        
-        string = wi_date_iso8601_string(date);
-        

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

@@ -61 +61 @@
-WI_EXPORT void                                          wi_p7_message_deserialize(wi_p7_message_t *);
-
+WI_EXPORT wi_boolean_t                          wi_p7_spec_is_compatible_with_protocol(wi_p7_spec_t *, wi_string_t *, double);
+
-WI_EXPORT wi_string_t *                         wi_p7_xml_string_for_attribute(xmlNodePtr, wi_string_t *);
-WI_EXPORT wi_integer_t                          wi_p7_xml_integer_for_attribute(xmlNodePtr, wi_string_t *);

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

@@ -51 +51 @@
-
-#define _WI_P7_SOCKET_XML_MAGIC                         0x3C3F786D
-2
+8
-
-#define _WI_P7_SOCKET_OPTIONS_ENCRYPTION_ENABLED(options)       \
@@ -242 +242 @@
-
-static wi_boolean_t _wi_p7_socket_connect_handshake(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout, wi_p7_options_t options) {
-uuid_t                      *protocol
+string_t                    *protocol_name
-        wi_p7_message_t         *p7_message;
-uint32_t         
+double_t         version, protocol_
-        wi_p7_uint32_t          compression, encryption;
-        
@@ -255 +255 @@
-        }
-
-
-
+
+
+
-        
-        if(p7_socket->serialization == WI_P7_BINARY) {
@@ -290 +291 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if(wi_p7_message_get_uint32_for_name(p7_message, &compression, WI_STR("p7.handshake.compression"))) {
@@ -345 +359 @@
-
-static wi_boolean_t _wi_p7_socket_accept_handshake(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout, wi_p7_options_t options) {
-uuid_t                      *protocol
+string_t                    *protocol_name
-        wi_p7_message_t         *p7_message;
-uint32_t         
+double_t         version, protocol_
-        wi_p7_enum_t            compression, encryption;
-        
@@ -364 +378 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if(p7_socket->serialization == WI_P7_BINARY) {
@@ -405 +430 @@
-        }
-        
-
-
+
+
+
-        
-        if(p7_socket->options & WI_P7_COMPRESSION_DEFLATE)
@@ -1245 +1271 @@
-        wi_p7_message_deserialize(p7_message);
-        
-        wi_log_info(WI_STR("data = %@"), wi_data_with_bytes(p7_message->binary_buffer, p7_message->binary_size));
-
-        wi_log_info(WI_STR("Received %@"), p7_message);
-

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

@@ -34 +34 @@
-#include <wired/wi-runtime.h>
-#include <wired/wi-socket.h>
-
-#define WI_P7_VERSION                                                           1
-
-enum _wi_p7_options {

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

@@ -252 +252 @@
-        
-        wi_string_t                                                             *filename;
-
-
+
+
+
+
-        
-        wi_hash_t                                                               *messages_name, *messages_id;
@@ -290 +292 @@
-        "                        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-        "                        xsi:schemaLocation=\"http://www.zankasoftware.com/P7/Specification p7-specification.xsd\""
-id=\"FC154842-628F-4CA1-854B-32A652C92882
+name=\"P7\" version=\"1.0
-        "       <p7:types>"
-        "               <p7:type name=\"bool\" id=\"1\" size=\"1\" />"
@@ -307 +309 @@
-        ""
-        "       <p7:fields>"
-
-
-
+
+
+
+
-        "                       <p7:enum name=\"p7.handshake.compression.deflate\" value=\"0\" />"
-        "               </p7:field>"
-4
+5
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_aes256_sha1\" value=\"0\" />"
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_bf128_sha1\" value=\"1\" />"
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_3des192_sha1\" value=\"2\" />"
-        "               </p7:field>"
-5
+6
-        ""
-6
-7
-8
-9
-0
-1
+7
+8
+9
+10
+1
+2
-        ""
-2
-3
+3
+4
-        "       </p7:fields>"
-        ""
@@ -333 +336 @@
-        "               <p7:message name=\"p7.handshake\" id=\"1\">"
-        "                       <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
-
+
+
-        "                       <p7:parameter field=\"p7.handshake.encryption\" />"
-        "                       <p7:parameter field=\"p7.handshake.compression\" />"
@@ -340 +344 @@
-        "               <p7:message name=\"p7.handshake.reply\" id=\"2\">"
-        "                       <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
-
+
+
-        "                       <p7:parameter field=\"p7.handshake.encryption\" />"
-        "                       <p7:parameter field=\"p7.handshake.compression\" />"
@@ -464 +469 @@
-        };
-        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return p7_spec;
@@ -536 +544 @@
-
-        wi_release(p7_spec->filename);
-id
-id
+name
+protocol
-        
-        wi_release(p7_spec->messages_name);
@@ -556 +564 @@
-        wi_p7_spec_t            *p7_spec = instance;
-        
-
+name = %@, version = %.1f, 
-                wi_runtime_class_name(p7_spec),
-                p7_spec,
+                p7_spec->name,
+                p7_spec->version,
-                p7_spec->types_name,
-                p7_spec->fields_name,
@@ -655 +665 @@
-
-static wi_boolean_t _wi_p7_spec_load_spec(wi_p7_spec_t *p7_spec, xmlDocPtr doc) {
-string
+version
-        xmlNodePtr              root_node, node;
-        
-        root_node = xmlDocGetRootElement(doc);
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        for(node = root_node->children; node != NULL; node = node->next) {
@@ -840 +865 @@
-#pragma mark -
-
-
-
+
+
+
-}
-
@@ -851 +877 @@
-        compatible = _wi_p7_spec_is_compatible(p7_spec, other_p7_spec);
-        
-
-
+
+
+
+
-        
-        return compatible;
@@ -1132 +1160 @@
-#pragma mark -
-
-
-
+
+
+
+
+
+
+
+
-}
-

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

@@ -47 +47 @@
-WI_EXPORT wi_p7_spec_t *                                wi_p7_spec_init_with_string(wi_p7_spec_t *, wi_string_t *);
-
-WI_EXPORT wi_boolean_t                                  wi_p7_spec_is_compatible_with_id(wi_p7_spec_t *, wi_uuid_t *);
-WI_EXPORT wi_boolean_t                                  wi_p7_spec_is_compatible_with_spec(wi_p7_spec_t *, wi_p7_spec_t *);
-
-
+
+
-WI_EXPORT wi_string_t *                                 wi_p7_spec_xml(wi_p7_spec_t *);
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_message_id(wi_p7_spec_t *, wi_string_t *);

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

@@ -38 +38 @@
-        "                        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-        "                        xsi:schemaLocation=\"http://www.zankasoftware.com/P7/Specification p7.xsd\""
-
+
+
-        "       <p7:fields>"
-        "               <p7:field name=\"test.bool\" type=\"bool\" id=\"1000\" />"
@@ -124 +125 @@
-        WI_TEST_ASSERT_NOT_NULL(p7_spec, "");
-        
-
+
+
-        
-        WI_TEST_ASSERT_EQUALS(wi_p7_spec_message_id(p7_spec, WI_STR("test")), 1000U, "");