Changeset 3554

Timestamp:

01/15/07 14:35:11 (2 years ago)

Author:

timothy

Message:

Some people expect to use ports greater than 65535, we will now allow it for new connections and DCC requests by moding the port number with 65535 before using it.

Files:

• trunk/Chat Core/MVChatConnection.m (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (5 diffs)
• trunk/Controllers/MVConnectionsController.m (modified) (2 diffs)
• trunk/Inspectors/JVConnectionInspector.m (modified) (1 diff)

trunk/Chat Core/MVChatConnection.m

@@ -112 +112 @@
-        else if( [[serverURL scheme] isEqualToString:@"silc"] ) connectionType = MVChatConnectionSILCType;
-
-[[serverURL port] unsignedShortValue]
+( [[serverURL port] unsignedIntValue] % 65535 )
-                [self setNicknamePassword:[serverURL password]];
-

trunk/Chat Core/MVIRCChatConnection.m

@@ -1644 +1644 @@
-                                }
-
+                                port %= 65535; // some clients use ports greater than 65535, mod with 65535 to get the real port
+
-                                if( passive && port > 0 ) {
-                                        // this is a passive reply, look up the original transfer
@@ -1700 +1702 @@
-                                        passive = YES;
-
+                                port %= 65535; // some clients use ports greater than 65535, mod with 65535 to get the real port
+
-                                @synchronized( _directClientConnections ) {
-                                        NSEnumerator *enumerator = [_directClientConnections objectEnumerator];
@@ -1734 +1738 @@
-                                        passive = YES;
-
+                                port %= 65535; // some clients use ports greater than 65535, mod with 65535 to get the real port
+
-                                @synchronized( _directClientConnections ) {
-                                        NSEnumerator *enumerator = [_directClientConnections objectEnumerator];
@@ -1774 +1780 @@
-                                }
-
+                                port %= 65535; // some clients use ports greater than 65535, mod with 65535 to get the real port
+
-                                if( [fileName isCaseInsensitiveEqualToString:@"CHAT"] || [fileName isCaseInsensitiveEqualToString:@"C H A T"] ) {
-                                        if( passive && port > 0 ) {
@@ -1854 +1862 @@
-                                        if( [scanner scanLongLong:NULL] && [scanner scanLongLong:&passiveId] )
-                                                passive = YES;
+
+                                        port %= 65535; // some clients use ports greater than 65535, mod with 65535 to get the real port
-
-                                        @synchronized( _directClientConnections ) {

trunk/Controllers/MVConnectionsController.m

@@ -340 +340 @@
-        }
-
-|| [newPort intValue] > 65535 
+
-                [[self window] makeFirstResponder:newPort];
-                NSRunCriticalAlertPanel( NSLocalizedString( @"Chat Server Port is invalid", "chat invalid nickname dialog title" ), NSLocalizedString( @"The chat server port you specified is invalid because it can't be negative or greater than 65535.", "chat server port invalid dialog message" ), nil, nil, nil );
@@ -1148 +1148 @@
-                        [(MVChatConnection *)[[_bookmarks objectAtIndex:row] objectForKey:@"connection"] setServer:object];
-                } else if( [[column identifier] isEqual:@"port"] ) {
-[object unsignedShortValue]
+( [object unsignedIntValue] % 65535 )
-                }
-                [self _saveBookmarkList];

trunk/Inspectors/JVConnectionInspector.m

@@ -179 +179 @@
-                [_connection setUsername:[sender stringValue]];
-        } else if( sender == editPort ) {
-unsigned short)[sender intValue]
+ (unsigned int)[sender intValue] % 65535 )
-        }
-}