Changeset 4614

Timestamp:

02/14/07 01:40:10 (2 years ago)

Author:

morris

Message:

Get rid of checking, use debug logging instead

Files:

• libwired/trunk/libwired/p7/wi-p7-message.c (modified) (2 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-spec.c (modified) (54 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)

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

@@ -511 +511 @@
-        field_id = wi_p7_spec_field_id(p7_message->spec, field_name);
-        
-
-
-
-
+
-                return false;
-        }
-        
-        return _wi_p7_message_get_binary_buffer_for_reading_for_id(p7_message, field_id, 0, out_buffer, out_field_length);
@@ -528 +524 @@
-        field_id = wi_p7_spec_field_id(p7_message->spec, field_name);
-        
-
-
-
-
+
-                return false;
-        }
-        
-        if(length > 0)

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

@@ -63 +63 @@
-WI_EXPORT void                                          wi_p7_message_deserialize(wi_p7_message_t *);
-
-WI_EXPORT void                                          wi_p7_spec_log_warn(wi_p7_spec_t *, wi_string_t *, ...);
-WI_EXPORT wi_boolean_t                          wi_p7_spec_is_checking(wi_p7_spec_t *);
-
-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

@@ -267 +267 @@
-           wi_p7_message_set_enum_for_name(p7_message, 0, WI_STR("p7.handshake.compression"));
-        
+        wi_log_info(WI_STR("should set %u for encryption"), wi_p7_spec_enum_value(p7_socket->spec, 4, WI_STR("p7.handshake.encryption.rsa_aes_256")));
+        
-        if(options & WI_P7_ENCRYPTION_RSA_AES)
-                wi_p7_message_set_enum_for_name(p7_message, 0, WI_STR("p7.handshake.encryption"));
@@ -384 +386 @@
-        
-        if(wi_p7_message_get_enum_for_name(p7_message, &encryption, WI_STR("p7.handshake.encryption"))) {
+                wi_log_info(WI_STR("should get %@ for %u"), wi_p7_spec_enum_name(p7_socket->spec, 4, encryption), encryption);
+
-                if(encryption == 0 && options & WI_P7_ENCRYPTION_RSA_AES)
-                        p7_socket->options |= WI_P7_ENCRYPTION_RSA_AES;
@@ -438 +442 @@
-
-static wi_boolean_t _wi_p7_socket_connect_key_exchange(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout, wi_string_t *username_string, wi_string_t *password_string) {
-       
-       
-       
-unsigned char                  *cipher_key = NULL, *iv = NULL
-const unsigned char            *bytes
-void                                   *username = NULL, *server_password = NULL, *client_password = NULL
-uint32_t                               cipher_key_length, iv_length, username_length, client_password_length, server_password
+
+
+
+const void                     *bytes
+void                           *username = NULL, *server_password = NULL, *client_password = NULL, *cipher_key = NULL, *iv = NULL
+uint32_t                       username_length, client_password_length, server_password_length
+int32_t                                iv_length, cipher_key
-        
-        p7_message = wi_p7_socket_read_message(p7_socket, timeout);
@@ -491 +495 @@
-
-        if(EVP_SealInit(&p7_socket->cipher_ctx,
-
+
+
-                                        (int *) &cipher_key_length,
-
-
+
+
+
-                ERR_print_errors_fp(stderr);
-                
@@ -567 +573 @@
-                goto end;
-        
-(char *) 
+
-
-        if(!wi_is_equal(server_password_string, client_password_string2)) {
@@ -599 +605 @@
-
-static wi_boolean_t _wi_p7_socket_accept_key_exchange(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout) {
-
-
-
-
-
-
+
+
+
+
+
-        
-        if(!p7_socket->private_key) {
@@ -612 +617 @@
-        }
-        
-
+(unsigned char **) 
-        
-        if(public_key_length <= 0) {
@@ -836 +841 @@
-        }
-        
-, wi_p7_spec_is_checking(p7_socket->spec)
+
-        
-        if(!p7_spec) {

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

@@ -244 +244 @@
-        wi_runtime_base_t                                               base;
-        
-        wi_boolean_t                                                    checking;
-        
-        wi_string_t                                                             *xml;
-        
@@ -261 +259 @@
-static wi_string_t *                                            _wi_p7_spec_description(wi_runtime_instance_t *);
-
-
-
-
+
+
+
+
+
-static wi_boolean_t                                                     _wi_p7_spec_load_spec(wi_p7_spec_t *, xmlDocPtr);
-static wi_boolean_t                                                     _wi_p7_spec_load_types(wi_p7_spec_t *, xmlNodePtr);
@@ -468 +468 @@
-        p7_spec->filename = wi_retain(WI_STR("(builtin)"));
-
-, true
+
-                wi_error_set_lib_error(WI_ERROR_P7_INVALIDSPEC);
-                
@@ -481 +481 @@
-
-
-, wi_boolean_t checking
+
-        if(!_wi_p7_spec_builtin_spec) {
-                _wi_p7_spec_builtin_spec = wi_p7_spec_init_builtin(wi_p7_spec_alloc());
@@ -493 +493 @@
-        
-        p7_spec = _wi_p7_spec_init(p7_spec);
-        p7_spec->checking = checking;
-        p7_spec->filename = wi_retain(wi_string_last_path_component(path));
-        
-, checking
+
-                wi_error_set_lib_error(WI_ERROR_P7_INVALIDSPEC);
-                
@@ -509 +508 @@
-
-
-, wi_boolean_t checking
+
-        if(!_wi_p7_spec_builtin_spec) {
-                _wi_p7_spec_builtin_spec = wi_p7_spec_init_builtin(wi_p7_spec_alloc());
@@ -522 +521 @@
-        p7_spec = _wi_p7_spec_init(p7_spec);
-        
-, checking
+
-                wi_error_set_lib_error(WI_ERROR_P7_INVALIDSPEC);
-                
@@ -572 +571 @@
-#pragma mark -
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        xmlDocPtr               doc;
-        
@@ -583 +602 @@
-        }
-        
-        p7_spec->checking = checking;
-        
-        if(!_wi_p7_spec_load_spec(p7_spec, doc)) {
-                xmlFreeDoc(doc);
@@ -598 +615 @@
-
-
-, wi_boolean_t checking
+
-        xmlDocPtr       doc;
-        xmlChar         *buffer;
@@ -629 +646 @@
-
-
-, wi_boolean_t checking
+
-        xmlDocPtr       doc;
-        xmlChar         *buffer;
@@ -641 +658 @@
-                return false;
-        }
-        
-        p7_spec->checking = checking;
-        
-        if(!_wi_p7_spec_load_spec(p7_spec, doc)) {
@@ -707 +722 @@
-                        type = _wi_p7_spec_type_with_node(p7_spec, type_node);
-                        
-
-
-
-
-
-
-
-
+
+
+
+
-                                if(wi_hash_data_for_key(p7_spec->types_name, type->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                type->name);
-                                        
@@ -723 +734 @@
-
-                                if(wi_hash_data_for_key(p7_spec->types_id, (void *) type->id)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                type->name, type->id);
-                                        
@@ -748 +759 @@
-                        field = _wi_p7_spec_field_with_node(p7_spec, field_node);
-                        
-
-
-
-
-
-
-
-
+
+
+
+
-                                if(wi_hash_data_for_key(p7_spec->fields_name, field->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                field->name);
-                                        
@@ -764 +771 @@
-                                
-                                if(wi_hash_data_for_key(p7_spec->fields_id, (void *) field->id)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                field->name, field->id);
-                                        
@@ -789 +796 @@
-                        message = _wi_p7_spec_message_with_node(p7_spec, message_node);
-                        
-
-
-
-
-
-
-
-
+
+
+
+
-                                if(wi_hash_data_for_key(p7_spec->messages_name, message->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                message->name);
-                                        
@@ -805 +808 @@
-                                
-                                if(wi_hash_data_for_key(p7_spec->messages_id, (void *) message->id)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                message->id, message->name);
-                                        
@@ -830 +833 @@
-                        transaction = _wi_p7_spec_transaction_with_node(p7_spec, transaction_node);
-                        
-
-
-
-
-
-
-
-
+
+
+
+
-                                if(wi_hash_data_for_key(p7_spec->transactions_name, transaction->message->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                transaction->message->name);
-                                        
@@ -857 +856 @@
-#pragma mark -
-
-void wi_p7_spec_log_warn(wi_p7_spec_t *p7_spec, wi_string_t *fmt, ...) {
-        wi_string_t             *string;
-        va_list                 ap;
-        
-        if(p7_spec->checking) {
-                va_start(ap, fmt);
-                string = wi_string_init_with_format_and_arguments(wi_string_alloc(), fmt, ap);
-                va_end(ap);
-                
-                if(p7_spec->filename)
-                        wi_log_warn(WI_STR("%@: %@"), p7_spec->filename, string);
-                else
-                        wi_log_warn(WI_STR("%@"), string);
-        }
-}
-
-
-
-#pragma mark -
-
-wi_boolean_t wi_p7_spec_is_checking(wi_p7_spec_t *p7_spec) {
-        return p7_spec->checking;
-}
-
-
-
-#pragma mark -
-
-wi_boolean_t wi_p7_spec_is_compatible_with_id(wi_p7_spec_t *p7_spec, wi_uuid_t *id) {
-        return (wi_is_equal(p7_spec->id, id) || wi_set_contains_data(p7_spec->compatible_ids, id));
@@ -928 +899 @@
-                if(!other_transaction || !other_transaction->required) {
-                        if(!other_transaction) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        transaction->message->name);
-                        } else {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        transaction->message->name);
-                        }
@@ -944 +915 @@
-                
-                if(transaction->originator != other_transaction->originator) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                transaction->message->name,
-                                _wi_p7_spec_transaction_originator(transaction),
@@ -1003 +974 @@
-        
-        if(count != other_count) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        transaction->message->name,
-                        count,
@@ -1028 +999 @@
-                if(!other_reply || !other_reply->required) {
-                        if(!other_reply) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        reply->message->name, transaction->message->name);
-                        } else {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        reply->message->name, transaction->message->name);
-                        }
@@ -1041 +1012 @@
-        if(other_reply) {
-                if(reply->count != other_reply->count) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                reply->message->name,
-                                reply->count,
@@ -1071 +1042 @@
-        
-        if(message->id != other_message->id) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        WI_STR("Message in reply \"%@\" in transaction \"%@\" should have id %u, but peer has id %u"),
-                        message->name, transaction->message->name, message->id, other_message->id);
@@ -1087 +1058 @@
-                        if(!other_parameter || !other_parameter->required) {
-                                if(!other_parameter) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" is required, but peer lacks it"),
-                                                parameter->field->name, message->name, transaction->message->name);
-                                } else {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" is required, but peer has it optional"),
-                                                parameter->field->name, message->name, transaction->message->name);
@@ -1105 +1076 @@
-                        
-                        if(field->id != other_field->id) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        WI_STR("Field in parameter \"%@\" in reply \"%@\" in transaction \"%@\" should have id %u, but peer has id %u"),
-                                        parameter->field->name, message->name, transaction->message->name, field->id, other_field->id);
@@ -1113 +1084 @@
-                        
-                        if(field->type->id != other_field->type->id) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" should be of type \"%@\", but peer has it as \"%@\""),
-                                        parameter->field->name, message->name, transaction->message->name, field->type->name, other_field->type->name);
@@ -1122 +1093 @@
-                        if(field->type->id == WI_P7_ENUM) {
-                                if(!wi_is_equal(field->enums_name, other_field->enums_name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                WI_STR("Parameter \"%@\" in reply \"%@\" in transaction \"%@\" have enumerations that differ with those of peer"),
-                                                parameter->field->name, message->name, transaction->message->name);
@@ -1159 +1130 @@
-                message = wi_hash_data_for_key(_wi_p7_spec_builtin_spec->messages_name, message_name);
-        
-
+
+
+
+
-                return WI_P7_SPEC_MESSAGE_ID_NULL;
+        }
-        
-        return message->id;
@@ -1191 +1166 @@
-                field = wi_hash_data_for_key(_wi_p7_spec_builtin_spec->fields_name, field_name);
-
-
+
+
+
+
-                return WI_P7_SPEC_FIELD_ID_NULL;
+        }
-        
-        return field->id;
@@ -1320 +1299 @@
-        
-        if(!type->name) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                
-                return NULL;
@@ -1328 +1307 @@
-        
-        if(type->id == WI_P7_SPEC_TYPE_ID_NULL) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        type->name);
-                
@@ -1388 +1367 @@
-
-        if(!field->name) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-
-                return NULL;
@@ -1396 +1375 @@
-
-        if(!type) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        field->name);
-
@@ -1408 +1387 @@
-        
-        if(!field->type) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        field->name, type);
-
@@ -1417 +1396 @@
-        
-        if(field->id == WI_P7_SPEC_FIELD_ID_NULL) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        field->name);
-
@@ -1432 +1411 @@
-                                
-                                if(!name) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                field->name);
-                                        
@@ -1487 +1466 @@
-
-        if(!message->name) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                
-                return NULL;
@@ -1495 +1474 @@
-        
-        if(message->id == WI_P7_SPEC_MESSAGE_ID_NULL) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        message->name);
-
@@ -1505 +1484 @@
-                        parameter = _wi_p7_spec_parameter_with_node(p7_spec, parameter_node, message);
-
-
-
-
-
-
-
-
-
+
+
+
+
-                                if(wi_hash_data_for_key(message->parameters, parameter->field->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                message->name, parameter->field->name);
-                                        
@@ -1562 +1537 @@
-
-        if(!field) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        message->name);
-                
@@ -1574 +1549 @@
-        
-        if(!parameter->field) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        message->name, field);
-                
@@ -1583 +1558 @@
-
-        if(use) {
-p7_spec->checking
+wi_log_level >= WI_LOG_DEBUG
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional")) != 0) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        message->name, parameter->field->name, use);
-                                
@@ -1631 +1606 @@
-        
-        if(!message) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                
-                return NULL;
@@ -1642 +1617 @@
-        
-        if(!transaction->message) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        message);
-                
@@ -1651 +1626 @@
-
-        if(!originator) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        transaction->message->name);
-                
@@ -1657 +1632 @@
-        }
-
-p7_spec->checking
+wi_log_level >= WI_LOG_DEBUG
-                if(wi_string_case_insensitive_compare(originator, WI_STR("client")) != 0 &&
-                   wi_string_case_insensitive_compare(originator, WI_STR("server")) != 0 &&
-                   wi_string_case_insensitive_compare(originator, WI_STR("both")) != 0) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                transaction->message->name, originator);
-                        
@@ -1678 +1653 @@
-
-        if(use) {
-p7_spec->checking
+wi_log_level >= WI_LOG_DEBUG
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional"))) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        transaction->message->name, use);
-                                
@@ -1753 +1728 @@
-                                reply = _wi_p7_spec_reply_with_node(p7_spec, andor_node, transaction);
-
-
-
-
-
-
-
+
+
-                                
-p7_spec->checking
+wi_log_level >= WI_LOG_DEBUG
-                                        if(wi_hash_data_for_key(andor->replies_hash, reply->message->name)) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                                        transaction->message->name, reply->message->name);
-                                                
@@ -1820 +1791 @@
-
-        if(!message) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        transaction->message->name);
-                
@@ -1832 +1803 @@
-        
-        if(!reply->message) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                        transaction->message->name, message);
-                
@@ -1841 +1812 @@
-
-        if(use) {
-p7_spec->checking
+wi_log_level >= WI_LOG_DEBUG
-                        if(wi_string_case_insensitive_compare(use, WI_STR("required")) != 0 &&
-                           wi_string_case_insensitive_compare(use, WI_STR("optional"))) {
-wi_p7_spec_log_warn
+_wi_p7_spec_log_debug
-                                        reply->message->name, transaction->message->name, use);
-