Changeset 102

Timestamp:

01/20/08 14:32:03 (10 months ago)

Author:

cordney

Message:

[fix] firewall not accepting new tcp|udp only redirects (#25)

Files:

• branches/0_9_1/changelog.txt (modified) (1 diff)
• branches/0_9_1/qcontrol/cocoaControlEditPC.m (modified) (16 diffs)

branches/0_9_1/changelog.txt

@@ +1 @@
+Q-0.9.1d102
+[fix] firewall not accepting new tcp|udp only redirects (#25)
+
-Q-0.9.1d101
-[fix] include network cards bios in .app (#74)

branches/0_9_1/qcontrol/cocoaControlEditPC.m

@@ -1117 +1117 @@
-    [self saveFirewallPortList];
-    [[thisPC objectForKey:@"Arguments"] appendFormat:@"%@",[self constructFirewallArguments]];
-
+
+
-    /* qemu arguments */
-    if ([[textFieldArguments stringValue] length] > 0) 
@@ -1203 +1204 @@
-- (void)initFirewallSettings
-{
+    //NSLog(@"cocoaControlEditPC: initFirewallSettings");
-    firewallPortTableEnabled = YES;
-    if(firewallPortList == nil) {
@@ -1255 +1257 @@
-- (IBAction) startShowNewPort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: startShowNewPort");
+
-    [self startEditPort:YES];
-}
-- (IBAction) startShowEditPort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: startShowEditPort");
+
-    int restrictedPort = 0;
-    NSArray * additionalPorts = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"fw-additionals" ofType:@"plist"]];
@@ -1299 +1305 @@
-- (void) startEditPort:(BOOL)newPort
-{  
+    //NSLog(@"cocoaControlEditPC: startEditPort");
+
-    /*[firewallPortPanel setFrame:NSMakeRect(
-        [firewallPortPanel frame].origin.x,
@@ -1351 +1359 @@
-- (IBAction) deletePort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: deletePort");
+
-    // check if port is a default port
-    if([firewallPortTable selectedRow] >= 0 && [firewallPortTable selectedRow] < [[NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"fw-defaults" ofType:@"plist"]] count]) {
@@ -1369 +1379 @@
-- (IBAction) setAdditionalPort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: setAdditionalPort");
+
-    // load data from fw-additionals.plist
-    if ([popUpButtonFirewallAdditionalPorts indexOfSelectedItem] <= ([popUpButtonFirewallAdditionalPorts numberOfItems] - 3)) {
@@ -1413 +1425 @@
-- (IBAction) saveNewPort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: saveNewPort");
+
-    if([self checkPort:YES] == YES) {
-        NSMutableDictionary * portDict;
@@ -1427 +1441 @@
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"TCP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
+            [portDict setObject: @"" forKey:@"UDP-Ports-Host"];
+            [portDict setObject: @"" forKey:@"UDP-Ports-Guest"];
-        } else if([popUpButtonFirewallServiceType indexOfSelectedItem] == 1) {
-            // udp only
+            [portDict setObject: @"" forKey:@"TCP-Ports-Host"];
+            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
+            [portDict setObject: @"" forKey:@"UDP-Ports-Host"];
+            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
+        } else if([popUpButtonFirewallServiceType indexOfSelectedItem] == 2) {
+            // tcp and udp
+            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"TCP-Ports-Host"];
+            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
+            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"UDP-Ports-Host"];
+            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
+        }
+        } // end predefined/custom check
+        // set enabled key
+        [portDict setObject:[NSNumber numberWithBool:YES] forKey:@"Enabled"];
+        // add to list
+        [firewallPortList addObject:portDict];
+        [self endEditPort:self];
+    }
+}
+
+- (IBAction) saveEditPort:(id)sender
+{
+    //NSLog(@"cocoaControlEditPC: saveEditPort");
+
+    if([self checkPort:NO] == YES) {
+        // save to edited port
+        int selectedPort = [firewallPortTable selectedRow];
+
+        NSMutableDictionary * portDict = [NSMutableDictionary dictionaryWithCapacity:5];
+        [portDict setObject:[textFieldFirewallPortName stringValue] forKey:@"Name"];
+        if([popUpButtonFirewallServiceType indexOfSelectedItem] == 0) {
+            // tcp only
+            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"TCP-Ports-Host"];
+            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
+            [portDict setObject: @"" forKey:@"UDP-Ports-Host"];
+            [portDict setObject: @"" forKey:@"UDP-Ports-Guest"];
+        } else if([popUpButtonFirewallServiceType indexOfSelectedItem] == 1) {
+            // udp only
+            [portDict setObject: @"" forKey:@"TCP-Ports-Host"];
+            [portDict setObject: @"" forKey:@"TCP-Ports-Guest"];
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"UDP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
@@ -1438 +1494 @@
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
-        }
-        } // end predefined/custom check
-        // set enabled key
-        [portDict setObject:[NSNumber numberWithBool:YES] forKey:@"Enabled"];
-        // add to list
-        [firewallPortList addObject:portDict];
-        [self endEditPort:self];
-    }
-}
-
-- (IBAction) saveEditPort:(id)sender
-{
-    if([self checkPort:NO] == YES) {
-        // save to edited port
-        int selectedPort = [firewallPortTable selectedRow];
-
-        NSMutableDictionary * portDict = [NSMutableDictionary dictionaryWithCapacity:5];
-        [portDict setObject:[textFieldFirewallPortName stringValue] forKey:@"Name"];
-        if([popUpButtonFirewallServiceType indexOfSelectedItem] == 0) {
-            // tcp only
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"TCP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
-        } else if([popUpButtonFirewallServiceType indexOfSelectedItem] == 1) {
-            // udp only
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"UDP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
-        } else if([popUpButtonFirewallServiceType indexOfSelectedItem] == 2) {
-            // tcp and udp
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"TCP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"TCP-Ports-Guest"];
-            [portDict setObject:[textFieldFirewallPortHostPorts stringValue] forKey:@"UDP-Ports-Host"];
-            [portDict setObject:[textFieldFirewallPortGuestPorts stringValue] forKey:@"UDP-Ports-Guest"];
-        }
-        // set enabled/disabled key
-        [portDict setObject:[[firewallPortList objectAtIndex:selectedPort] objectForKey:@"Enabled"] forKey:@"Enabled"];
@@ -1480 +1504 @@
-- (BOOL) checkPort:(BOOL)newPort
-{
+    //NSLog(@"cocoaControlEditPC: checkPort");
+
-    if([[textFieldFirewallPortName stringValue] isEqualToString:@""]) {
-        // name empty
@@ -1562 +1588 @@
-- (IBAction) endEditPort:(id)sender
-{
+    //NSLog(@"cocoaControlEditPC: endEditPort");
+
-    // reset
-    [textFieldFirewallPortName setStringValue:@""];
@@ -1583 +1611 @@
-- (void) saveFirewallPortList
-{
+    //NSLog(@"cocoaControlEditPC: saveFirewallPortList");
+
-    // save the ports in configuration.plist
-    // enumerate through entries and check for defaults, when enabled => save
-    NSArray * firewallDefaults = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"fw-defaults" ofType:@"plist"]];
-NSMutableArray arrayWithCapacity:10
+[NSMutableArray arrayWithCapacity:10] retain
-    int i;
-    int ii;
@@ -1603 +1633 @@
-        if(found == 0) {
-            // port is not default port, save to conf.plist regardless of Enabled
-
+
+
+
+
-        }
-        found = 0;
-    }
-
+
+
+
+
-}
-
-- (NSString *) constructFirewallArguments
-{
+    //NSLog(@"cocoaControlEditPC: constructFirewallArguments");
+    
-    NSArray * portlist = [[thisPC objectForKey:@"Network"] objectForKey:@"Redirect"];
-    NSMutableString * arguments = [NSMutableString stringWithCapacity:10];
@@ -1634 +1672 @@
-            for(ii=0; ii<[seperatedA count]; ii++) {
-            // tcp/udp
+                        
-            id tp = [typeA objectAtIndex:ii];
-
-
-
-
-
-
+
+
+
+
+
-            /* comma code */
-            if([hc count] > 1 && [gc count] > 1) {
@@ -1672 +1710 @@
-                    }
-            }
-
+
-            /* haifin code */
-            if([hh count] > 1 && [gh count] > 1) {
@@ -1701 +1739 @@
-                    }
-            }
-
+
-            /* only one=>one port code */
-            // check also for empty port ranges, because componentsSeperatedByString: returns count 1 even from an empty string