Changeset 5381

Timestamp:

03/14/08 07:42:30 (6 months ago)

Author:

morris

Message:

Change version to a string

Files:

• libwired/trunk/libwired/p7/wi-p7-private.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (15 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (10 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)

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

@@ -64 +64 @@
-WI_EXPORT void                                                          wi_p7_message_deserialize(wi_p7_message_t *);
-
-double
+wi_string_t *
-
-WI_EXPORT wi_string_t *                                         wi_p7_xml_copy_string_for_attribute(xmlNodePtr, wi_string_t *);

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

@@ -134 +134 @@
-        wi_p7_spec_t                                                    *spec;
-        wi_string_t                                                             *name;
-double                                                                 
+wi_string_t                                                            *
-        
-        wi_p7_serialization_t                                   serialization;
@@ -278 +278 @@
-        wi_release(p7_socket->spec);
-        wi_release(p7_socket->name);
+        wi_release(p7_socket->version);
-        wi_release(p7_socket->rsa);
-        wi_release(p7_socket->cipher);
@@ -355 +356 @@
-
-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) {
+        wi_string_t                     *version;
-        wi_p7_message_t         *p7_message;
-        wi_p7_double_t          version;
-        wi_p7_enum_t            flag;
-        
@@ -364 +365 @@
-                return false;
-
-double
+string
-                return false;
-        
@@ -370 +371 @@
-                return false;
-        
-double
+string
-                return false;
-        
@@ -415 +416 @@
-        }
-        
-
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Message has no \"p7.handshake.version\" field"));
@@ -422 +425 @@
-        }
-
-version != wi_p7_spec_version(wi_p7_spec_builtin_spec(
+!wi_is_equal(version, wi_p7_spec_version(wi_p7_spec_builtin_spec()
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Remote P7 protocol %.1f is not compatible"),
@@ -439 +442 @@
-        }
-        
-
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Message has no \"p7.handshake.protocol_version\" field"));
@@ -481 +486 @@
-
-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) {
+        wi_string_t                     *version;
-        wi_p7_message_t         *p7_message;
-        wi_p7_double_t          version;
-        wi_p7_enum_t            flag;
-        wi_p7_options_t         client_options;
@@ -499 +504 @@
-        }
-        
-
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Message has no \"p7.handshake.version\" field"));
@@ -506 +513 @@
-        }
-        
-version != wi_p7_spec_version(wi_p7_spec_builtin_spec(
+!wi_is_equal(version, wi_p7_spec_version(wi_p7_spec_builtin_spec()
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Remote P7 protocol %.1f is not compatible"),
@@ -523 +530 @@
-        }
-        
-
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-                        WI_STR("Message has no \"p7.handshake.protocol_version\" field"));
@@ -560 +569 @@
-                return false;
-        
-double
+string
-                return false;
-        
@@ -566 +575 @@
-                return false;
-        
-double
+string
-                return false;
-        
@@ -989 +998 @@
-        
-        compatible = wi_p7_spec_is_compatible_with_spec(p7_socket->spec, p7_spec);
-
+
+
+
-        wi_release(p7_spec);
-

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

@@ -302 +302 @@
-        wi_string_t                                                             *filename;
-        wi_string_t                                                             *name;
-double                                                                 
+wi_string_t                                                            *
-        wi_p7_originator_t                                              originator;
-        
@@ -367 +367 @@
-        ""
-        "       <p7:fields>"
-double
+string
-        "               <p7:field name=\"p7.handshake.protocol_name\" type=\"string\" id=\"2\" />"
-double
+string
-        "               <p7:field name=\"p7.handshake.compression\" type=\"enum\" id=\"4\">"
-        "                       <p7:enum name=\"p7.handshake.compression.deflate\" value=\"0\" />"
@@ -637 +637 @@
-        wi_release(p7_spec->filename);
-        wi_release(p7_spec->name);
+        wi_release(p7_spec->version);
-        wi_release(p7_spec->compatible_protocols);
-        
@@ -657 +658 @@
-        wi_p7_spec_t            *p7_spec = instance;
-        
-.1f
+@
-                wi_runtime_class_name(p7_spec),
-                p7_spec,
@@ -758 +759 @@
-
-static wi_boolean_t _wi_p7_spec_load_spec(wi_p7_spec_t *p7_spec, xmlDocPtr doc) {
-        wi_string_t             *version;
-        xmlNodePtr              root_node, node;
-        
@@ -780 +780 @@
-        }
-        
-version = wi_autorelease(wi_p7_xml_copy_string_for_attribute(root_node, WI_STR("version")
-
-
+p7_spec->version = wi_p7_xml_copy_string_for_attribute(root_node, WI_STR("version"
+
+p7_spec->
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-                        WI_STR("Protocol has no \"version\""));
@@ -788 +788 @@
-                return false;
-        }
-        
-        p7_spec->version = wi_string_double(version);
-
-        for(node = root_node->children; node != NULL; node = node->next) {
@@ -1070 +1068 @@
-#pragma mark -
-
-double 
-p7_spec->version == version
-.1f
+wi_string_t *
+wi_is_equal(p7_spec->version, version)
+@
-}
-
@@ -1083 +1081 @@
-        
-        if(compatible) {
-.1f
+@
-                        other_p7_spec->name, other_p7_spec->version));
-        }
@@ -1409 +1407 @@
-
-
-double
+wi_string_t *
-        return p7_spec->version;
-}

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

@@ -59 +59 @@
-
-WI_EXPORT wi_string_t *                                 wi_p7_spec_name(wi_p7_spec_t *);
-double       
+wi_string_t *
-WI_EXPORT wi_p7_originator_t                    wi_p7_spec_originator(wi_p7_spec_t *);
-WI_EXPORT wi_string_t *                                 wi_p7_spec_xml(wi_p7_spec_t *);