Changeset 54

Timestamp:

02/09/07 03:52:56 (4 years ago)

Author:

tyler

Message:

• Finish implementing the little GUI app

Location:

trunk/PmpMyApp

Files:

• English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• PmpMyApp.xcodeproj/project.pbxproj (modified) (6 diffs)
• PmpMyApp.xcodeproj/tyler.mode1 (modified) (11 diffs)
• PmpMyApp.xcodeproj/tyler.pbxuser (modified) (5 diffs)
• source/XzibitController.h (added)
• source/XzibitController.m (added)
• source/pmpmapper.c (modified) (4 diffs)
• source/pmpmapper.h (modified) (2 diffs)

trunk/PmpMyApp/English.lproj/MainMenu.nib/classes.nib

@@ -1 +1 @@
 {
-    IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); 
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {createMapping = id; destroyMapping = id; }; 
+            CLASS = XzibitController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                localCreatePort = NSTextField; 
+                localDestroyPort = NSTextField; 
+                mappingDuration = NSTextField; 
+                natCreatePort = NSTextField; 
+                statusField = NSTextField; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
     IBVersion = 1; 
 }

trunk/PmpMyApp/PmpMyApp.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
+                2F18D6740B7C6AF400149D44 /* XzibitController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F18D6730B7C6AF400149D44 /* XzibitController.m */; };
                 2F5A48720B75598F0052B0C1 /* pmpmapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */; };
                 2F5A48900B75658F0052B0C1 /* pmpmapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */; };
@@ -28 +29 @@
                 2F18D56B0B7C516D00149D44 /* draft-cheshire-nat-pmp.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "draft-cheshire-nat-pmp.rtf"; path = "doc/draft-cheshire-nat-pmp.rtf"; sourceTree = "<group>"; };
                 2F18D56C0B7C516D00149D44 /* draft-cheshire-nat-pmp.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "draft-cheshire-nat-pmp.txt"; path = "doc/draft-cheshire-nat-pmp.txt"; sourceTree = "<group>"; };
+                2F18D6720B7C6AF400149D44 /* XzibitController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XzibitController.h; path = source/XzibitController.h; sourceTree = "<group>"; };
+                2F18D6730B7C6AF400149D44 /* XzibitController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XzibitController.m; path = source/XzibitController.m; sourceTree = "<group>"; };
                 2F5A48700B75598F0052B0C1 /* pmpmapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pmpmapper.h; path = source/pmpmapper.h; sourceTree = "<group>"; };
                 2F5A48710B75598F0052B0C1 /* pmpmapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pmpmapper.c; path = source/pmpmapper.c; sourceTree = "<group>"; };
@@ -61 +64 @@
                         children = (
                                 2F5A486C0B7559600052B0C1 /* NAT-PMP */,
+                                2F18D6720B7C6AF400149D44 /* XzibitController.h */,
+                                2F18D6730B7C6AF400149D44 /* XzibitController.m */,
                         );
                         name = Classes;
@@ -235 +240 @@
                                 2F5A48720B75598F0052B0C1 /* pmpmapper.c in Sources */,
                                 2F901ED00B7AEDB5004FF42C /* route.c in Sources */,
+                                2F18D6740B7C6AF400149D44 /* XzibitController.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -270 +276 @@
                                 GCC_OPTIMIZATION_LEVEL = 0;
                                 INSTALL_PATH = "$(HOME)/bin";
+                                OTHER_CFLAGS = "-DPMP_DEBUG";
                                 PREBINDING = NO;
                                 PRODUCT_NAME = PMPMapper;
@@ -288 +295 @@
                                 GCC_MODEL_TUNING = G5;
                                 INSTALL_PATH = "$(HOME)/bin";
+                                OTHER_CFLAGS = "-DPMP_DEBUG";
                                 PREBINDING = NO;
                                 PRODUCT_NAME = PMPMapper;

trunk/PmpMyApp/PmpMyApp.xcodeproj/tyler.mode1

@@ -266 +266 @@
                                                         <array>
                                                                 <array>
-                                                                        <integer>6</integer>
-                                                                        <integer>2</integer>
+                                                                        <integer>8</integer>
                                                                         <integer>1</integer>
                                                                         <integer>0</integer>
@@ -310 +309 @@
                                                                 <string>1CE0B20306471E060097A5F4</string>
                                                                 <key>PBXProjectModuleLabel</key>
-                                                                <string>pmpmapper.c</string>
+                                                                <string>XzibitController.m</string>
                                                                 <key>PBXSplitModuleInNavigatorKey</key>
                                                                 <dict>
@@ -318 +317 @@
                                                                                 <string>1CE0B20406471E060097A5F4</string>
                                                                                 <key>PBXProjectModuleLabel</key>
-                                                                                <string>pmpmapper.c</string>
+                                                                                <string>XzibitController.m</string>
                                                                                 <key>_historyCapacity</key>
                                                                                 <integer>0</integer>
                                                                                 <key>bookmark</key>
-                                                                                <string>2F18D65A0B7C688B00149D44</string>
+                                                                                <string>2F18D69D0B7C6D9900149D44</string>
                                                                                 <key>history</key>
                                                                                 <array>
@@ -331 +330 @@
                                                                                         <string>2F9021510B7BE0FB004FF42C</string>
                                                                                         <string>2F18D5750B7C51B000149D44</string>
-                                                                                        <string>2F18D62D0B7C661600149D44</string>
-                                                                                        <string>2F18D62E0B7C661600149D44</string>
+                                                                                        <string>2F18D6800B7C6CA900149D44</string>
+                                                                                        <string>2F18D6950B7C6D8000149D44</string>
+                                                                                        <string>2F18D6960B7C6D8000149D44</string>
+                                                                                        <string>2F18D6970B7C6D8000149D44</string>
                                                                                 </array>
                                                                                 <key>prevStack</key>
@@ -344 +345 @@
                                                                                         <string>2F901EE10B7AEE09004FF42C</string>
                                                                                         <string>2F18D5770B7C51B000149D44</string>
-                                                                                        <string>2F18D60F0B7C60BE00149D44</string>
-                                                                                        <string>2F18D62F0B7C661600149D44</string>
+                                                                                        <string>2F18D66A0B7C68EB00149D44</string>
+                                                                                        <string>2F18D6840B7C6CA900149D44</string>
+                                                                                        <string>2F18D6850B7C6CA900149D44</string>
+                                                                                        <string>2F18D6860B7C6CA900149D44</string>
+                                                                                        <string>2F18D6870B7C6CA900149D44</string>
+                                                                                        <string>2F18D6980B7C6D8000149D44</string>
+                                                                                        <string>2F18D6990B7C6D8000149D44</string>
                                                                                 </array>
                                                                         </dict>
@@ -377 +383 @@
                                                         <dict>
                                                                 <key>Frame</key>
-                                                                <string>{{0, 883}, {951, 0}}</string>
+                                                                <string>{{0, 884}, {951, 0}}</string>
                                                                 <key>RubberWindowFrame</key>
                                                                 <string>1 104 1159 924 0 0 1680 1028 </string>
@@ -403 +409 @@
                         <key>TableOfContents</key>
                         <array>
-                                <string>2F18D5540B7C4C1900149D44</string>
+                                <string>2F18D66C0B7C68EB00149D44</string>
                                 <string>1CE0B1FE06471DED0097A5F4</string>
-                                <string>2F18D5550B7C4C1900149D44</string>
+                                <string>2F18D66D0B7C68EB00149D44</string>
                                 <string>1CE0B20306471E060097A5F4</string>
                                 <string>1CE0B20506471E060097A5F4</string>
@@ -539 +545 @@
         <key>WindowOrderList</key>
         <array>
-                <string>2F18D5FC0B7C5F9400149D44</string>
-                <string>2F18D5FD0B7C5F9400149D44</string>
-                <string>2F5A48CE0B756D650052B0C1</string>
-                <string>1CD10A99069EF8BA00B06720</string>
-                <string>2F18D5FA0B7C5F9400149D44</string>
                 <string>2F5A48970B7565A60052B0C1</string>
                 <string>1C0AD2B3069F1EA900FABCE6</string>
@@ -592 +593 @@
                                                         <dict>
                                                                 <key>PBXBuildLogShowsTranscriptDefaultKey</key>
-                                                                <string>{{0, 209}, {620, 261}}</string>
+                                                                <string>{{0, 149}, {620, 321}}</string>
                                                                 <key>PBXProjectModuleGUID</key>
                                                                 <string>XCMainBuildResultsModuleGUID</string>
@@ -630 +631 @@
                         <array>
                                 <string>2F5A48970B7565A60052B0C1</string>
-                                <string>2F18D55F0B7C4E5500149D44</string>
+                                <string>2F18D66E0B7C68EB00149D44</string>
                                 <string>1CD0528F0623707200166675</string>
                                 <string>XCMainBuildResultsModuleGUID</string>
@@ -1000 +1001 @@
                         <array>
                                 <string>1C0AD2B3069F1EA900FABCE6</string>
-                                <string>2F18D5560B7C4C1900149D44</string>
+                                <string>2F18D66F0B7C68EB00149D44</string>
                                 <string>1CD0528B0623707200166675</string>
-                                <string>2F18D5570B7C4C1900149D44</string>
+                                <string>2F18D6700B7C68EB00149D44</string>
                         </array>
                         <key>ToolbarConfiguration</key>

trunk/PmpMyApp/PmpMyApp.xcodeproj/tyler.pbxuser

@@ -10 +10 @@
         29B97313FDCFA39411CA2CEA /* Project object */ = {
                 activeBuildConfigurationName = Debug;
-                activeExecutable = 2F5A488B0B7565810052B0C1 /* PMPMapper */;
-                activeTarget = 2F5A48890B7565810052B0C1 /* PMPMapper */;
+                activeExecutable = 2F5A484B0B7558670052B0C1 /* PmpMyApp */;
+                activeTarget = 8D1107260486CEB800E47090 /* PmpMyApp */;
                 addToTargets = (
                         8D1107260486CEB800E47090 /* PmpMyApp */,
@@ -68 +68 @@
                                 );
                         };
-                        PBXPerProjectTemplateStateSaveDate = 192695317;
-                        PBXWorkspaceStateSaveDate = 192695317;
+                        PBXPerProjectTemplateStateSaveDate = 192702654;
+                        PBXWorkspaceStateSaveDate = 192702654;
                 };
                 perUserProjectItems = {
                         2F18D5750B7C51B000149D44 /* PBXTextBookmark */ = 2F18D5750B7C51B000149D44 /* PBXTextBookmark */;
                         2F18D5770B7C51B000149D44 /* PBXTextBookmark */ = 2F18D5770B7C51B000149D44 /* PBXTextBookmark */;
-                        2F18D60F0B7C60BE00149D44 /* PBXTextBookmark */ = 2F18D60F0B7C60BE00149D44 /* PBXTextBookmark */;
-                        2F18D62D0B7C661600149D44 /* PBXTextBookmark */ = 2F18D62D0B7C661600149D44 /* PBXTextBookmark */;
-                        2F18D62E0B7C661600149D44 /* PBXTextBookmark */ = 2F18D62E0B7C661600149D44 /* PBXTextBookmark */;
-                        2F18D62F0B7C661600149D44 /* PBXTextBookmark */ = 2F18D62F0B7C661600149D44 /* PBXTextBookmark */;
-                        2F18D65A0B7C688B00149D44 /* PBXTextBookmark */ = 2F18D65A0B7C688B00149D44 /* PBXTextBookmark */;
+                        2F18D66A0B7C68EB00149D44 /* PBXTextBookmark */ = 2F18D66A0B7C68EB00149D44 /* PBXTextBookmark */;
+                        2F18D6800B7C6CA900149D44 /* PBXTextBookmark */ = 2F18D6800B7C6CA900149D44 /* PBXTextBookmark */;
+                        2F18D6840B7C6CA900149D44 /* PBXTextBookmark */ = 2F18D6840B7C6CA900149D44 /* PBXTextBookmark */;
+                        2F18D6850B7C6CA900149D44 /* PBXTextBookmark */ = 2F18D6850B7C6CA900149D44 /* PBXTextBookmark */;
+                        2F18D6860B7C6CA900149D44 /* PBXTextBookmark */ = 2F18D6860B7C6CA900149D44 /* PBXTextBookmark */;
+                        2F18D6870B7C6CA900149D44 /* PBXTextBookmark */ = 2F18D6870B7C6CA900149D44 /* PBXTextBookmark */;
+                        2F18D6950B7C6D8000149D44 /* PBXTextBookmark */ = 2F18D6950B7C6D8000149D44 /* PBXTextBookmark */;
+                        2F18D6960B7C6D8000149D44 /* PBXTextBookmark */ = 2F18D6960B7C6D8000149D44 /* PBXTextBookmark */;
+                        2F18D6970B7C6D8000149D44 /* PBXTextBookmark */ = 2F18D6970B7C6D8000149D44 /* PBXTextBookmark */;
+                        2F18D6980B7C6D8000149D44 /* PBXTextBookmark */ = 2F18D6980B7C6D8000149D44 /* PBXTextBookmark */;
+                        2F18D6990B7C6D8000149D44 /* PBXTextBookmark */ = 2F18D6990B7C6D8000149D44 /* PBXTextBookmark */;
+                        2F18D69D0B7C6D9900149D44 /* PBXTextBookmark */ = 2F18D69D0B7C6D9900149D44 /* PBXTextBookmark */;
                         2F5A489C0B7565AE0052B0C1 /* PBXTextBookmark */ = 2F5A489C0B7565AE0052B0C1 /* PBXTextBookmark */;
                         2F5A489D0B7565AE0052B0C1 /* PBXTextBookmark */ = 2F5A489D0B7565AE0052B0C1 /* PBXTextBookmark */;
@@ -123 +130 @@
                 vrLoc = 0;
         };
-        2F18D60F0B7C60BE00149D44 /* PBXTextBookmark */ = {
-                isa = PBXTextBookmark;
-                fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
-                name = "pmpmapper.c: 151";
-                rLen = 0;
-                rLoc = 4269;
-                rType = 0;
-                vrLen = 754;
-                vrLoc = 3859;
-        };
-        2F18D62D0B7C661600149D44 /* PBXTextBookmark */ = {
-                isa = PBXTextBookmark;
-                fRef = 2F5A48700B75598F0052B0C1 /* pmpmapper.h */;
-                name = "pmpmapper.h: ";
-                rLen = 0;
-                rLoc = 1128;
-                rType = 0;
-                vrLen = 1117;
-                vrLoc = 201;
-        };
-        2F18D62E0B7C661600149D44 /* PBXTextBookmark */ = {
-                isa = PBXTextBookmark;
-                fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
-                name = "pmpmapper.c: 151";
-                rLen = 0;
-                rLoc = 4269;
-                rType = 0;
-                vrLen = 1951;
-                vrLoc = 3397;
-        };
-        2F18D62F0B7C661600149D44 /* PBXTextBookmark */ = {
-                isa = PBXTextBookmark;
-                fRef = 2F5A48700B75598F0052B0C1 /* pmpmapper.h */;
-                name = "pmpmapper.h: ";
-                rLen = 0;
-                rLoc = 1128;
-                rType = 0;
-                vrLen = 1117;
-                vrLoc = 201;
-        };
-        2F18D65A0B7C688B00149D44 /* PBXTextBookmark */ = {
+        2F18D66A0B7C68EB00149D44 /* PBXTextBookmark */ = {
                 isa = PBXTextBookmark;
                 fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
                 name = "pmpmapper.c: 279";
                 rLen = 0;
-                rLoc = 8097;
+                rLoc = 8035;
                 rType = 0;
                 vrLen = 1588;
                 vrLoc = 0;
         };
+        2F18D6720B7C6AF400149D44 /* XzibitController.h */ = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {904, 847}}";
+                        sepNavSelRange = "{406, 77}";
+                        sepNavVisRect = "{{0, 0}, {904, 847}}";
+                };
+        };
+        2F18D6730B7C6AF400149D44 /* XzibitController.m */ = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {904, 847}}";
+                        sepNavSelRange = "{824, 0}";
+                        sepNavVisRect = "{{0, 0}, {904, 847}}";
+                };
+        };
+        2F18D6800B7C6CA900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F18D6720B7C6AF400149D44 /* XzibitController.h */;
+                name = "XzibitController.h: 19";
+                rLen = 77;
+                rLoc = 406;
+                rType = 0;
+                vrLen = 490;
+                vrLoc = 0;
+        };
+        2F18D6840B7C6CA900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48700B75598F0052B0C1 /* pmpmapper.h */;
+                name = "pmpmapper.h: 26";
+                rLen = 0;
+                rLoc = 439;
+                rType = 0;
+                vrLen = 808;
+                vrLoc = 35;
+        };
+        2F18D6850B7C6CA900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F18D6720B7C6AF400149D44 /* XzibitController.h */;
+                name = "XzibitController.h: 19";
+                rLen = 77;
+                rLoc = 406;
+                rType = 0;
+                vrLen = 490;
+                vrLoc = 0;
+        };
+        2F18D6860B7C6CA900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F18D6730B7C6AF400149D44 /* XzibitController.m */;
+                name = "XzibitController.m: 19";
+                rLen = 0;
+                rLoc = 714;
+                rType = 0;
+                vrLen = 456;
+                vrLoc = 0;
+        };
+        2F18D6870B7C6CA900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
+                name = "pmpmapper.c: 237";
+                rLen = 0;
+                rLoc = 6828;
+                rType = 0;
+                vrLen = 1486;
+                vrLoc = 6002;
+        };
+        2F18D6950B7C6D8000149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48700B75598F0052B0C1 /* pmpmapper.h */;
+                name = "pmpmapper.h: pmp_destroy_map";
+                rLen = 0;
+                rLoc = 1499;
+                rType = 0;
+                vrLen = 1260;
+                vrLoc = 284;
+        };
+        2F18D6960B7C6D8000149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
+                name = "pmpmapper.c: 244";
+                rLen = 0;
+                rLoc = 7071;
+                rType = 0;
+                vrLen = 1533;
+                vrLoc = 6038;
+        };
+        2F18D6970B7C6D8000149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F18D6730B7C6AF400149D44 /* XzibitController.m */;
+                name = "XzibitController.m: 19";
+                rLen = 0;
+                rLoc = 714;
+                rType = 0;
+                vrLen = 456;
+                vrLoc = 0;
+        };
+        2F18D6980B7C6D8000149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48700B75598F0052B0C1 /* pmpmapper.h */;
+                name = "pmpmapper.h: pmp_destroy_map";
+                rLen = 0;
+                rLoc = 1499;
+                rType = 0;
+                vrLen = 1260;
+                vrLoc = 284;
+        };
+        2F18D6990B7C6D8000149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F5A48710B75598F0052B0C1 /* pmpmapper.c */;
+                name = "pmpmapper.c: 244";
+                rLen = 0;
+                rLoc = 7071;
+                rType = 0;
+                vrLen = 1533;
+                vrLoc = 6038;
+        };
+        2F18D69D0B7C6D9900149D44 /* PBXTextBookmark */ = {
+                isa = PBXTextBookmark;
+                fRef = 2F18D6730B7C6AF400149D44 /* XzibitController.m */;
+                name = "XzibitController.m: 34";
+                rLen = 0;
+                rLoc = 824;
+                rType = 0;
+                vrLen = 1069;
+                vrLoc = 0;
+        };
         2F5A484B0B7558670052B0C1 /* PmpMyApp */ = {
-                isa = PBXExecutable;
-                activeArgIndex = 2147483647;
-                activeArgIndices = (
-                );
-                argumentStrings = (
-                );
-                autoAttachOnCrash = 1;
-                configStateDict = {
-                };
-                customDataFormattersEnabled = 1;
-                debuggerPlugin = GDBDebugging;
-                disassemblyDisplayState = 0;
-                enableDebugStr = 1;
-                environmentEntries = (
-                );
-                executableSystemSymbolLevel = 0;
-                executableUserSymbolLevel = 0;
-                libgmallocEnabled = 0;
-                name = PmpMyApp;
-                sourceDirectories = (
-                );
-        };
-        2F5A48590B75586F0052B0C1 /* Source Control */ = {
-                isa = PBXSourceControlManager;
-                fallbackIsa = XCSourceControlManager;
-                isSCMEnabled = 0;
-                scmConfiguration = {
-                };
-                scmType = "";
-        };
-        2F5A485A0B75586F0052B0C1 /* Code sense */ = {
-                isa = PBXCodeSenseManager;
-                indexTemplatePath = "";
-        };
-        2F5A48700B75598F0052B0C1 /* pmpmapper.h */ = {
-                uiCtxt = {
-                        sepNavIntBoundsRect = "{{0, 0}, {904, 1036}}";
-                        sepNavSelRange = "{1128, 0}";
-                        sepNavVisRect = "{{0, 190}, {904, 846}}";
-                        sepNavWindowFrame = "{{1954, -14}, {939, 979}}";
-                };
-        };
-        2F5A48710B75598F0052B0C1 /* pmpmapper.c */ = {
-                uiCtxt = {
-                        sepNavIntBoundsRect = "{{0, 0}, {904, 4102}}";
-                        sepNavSelRange = "{8097, 0}";
-                        sepNavVisRect = "{{0, 0}, {904, 847}}";
-                };
-        };
-        2F5A48890B7565810052B0C1 /* PMPMapper */ = {
-                activeExec = 0;
-                executables = (
-                        2F5A488B0B7565810052B0C1 /* PMPMapper */,
-                );
-        };
-        2F5A488B0B7565810052B0C1 /* PMPMapper */ = {
                 isa = PBXExecutable;
                 activeArgIndex = 2147483647;
@@ -249 +284 @@
                 executableUserSymbolLevel = 0;
                 libgmallocEnabled = 0;
+                name = PmpMyApp;
+                sourceDirectories = (
+                );
+        };
+        2F5A48590B75586F0052B0C1 /* Source Control */ = {
+                isa = PBXSourceControlManager;
+                fallbackIsa = XCSourceControlManager;
+                isSCMEnabled = 0;
+                scmConfiguration = {
+                };
+                scmType = "";
+        };
+        2F5A485A0B75586F0052B0C1 /* Code sense */ = {
+                isa = PBXCodeSenseManager;
+                indexTemplatePath = "";
+        };
+        2F5A48700B75598F0052B0C1 /* pmpmapper.h */ = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {904, 1092}}";
+                        sepNavSelRange = "{1499, 0}";
+                        sepNavVisRect = "{{0, 245}, {904, 847}}";
+                        sepNavWindowFrame = "{{1954, -14}, {939, 979}}";
+                };
+        };
+        2F5A48710B75598F0052B0C1 /* pmpmapper.c */ = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {904, 4158}}";
+                        sepNavSelRange = "{7071, 0}";
+                        sepNavVisRect = "{{0, 2888}, {904, 847}}";
+                };
+        };
+        2F5A48890B7565810052B0C1 /* PMPMapper */ = {
+                activeExec = 0;
+                executables = (
+                        2F5A488B0B7565810052B0C1 /* PMPMapper */,
+                );
+        };
+        2F5A488B0B7565810052B0C1 /* PMPMapper */ = {
+                isa = PBXExecutable;
+                activeArgIndex = 2147483647;
+                activeArgIndices = (
+                );
+                argumentStrings = (
+                );
+                autoAttachOnCrash = 1;
+                configStateDict = {
+                };
+                customDataFormattersEnabled = 1;
+                debuggerPlugin = GDBDebugging;
+                disassemblyDisplayState = 0;
+                dylibVariantSuffix = "";
+                enableDebugStr = 1;
+                environmentEntries = (
+                );
+                executableSystemSymbolLevel = 0;
+                executableUserSymbolLevel = 0;
+                libgmallocEnabled = 0;
                 name = PMPMapper;
                 savedGlobals = {
@@ -318 +410 @@
                 name = "PMPMapper.c: 29";
                 rLen = 0;
-                rLoc = 7302;
+                rLoc = 7240;
                 rType = 0;
                 vrLen = 951;

trunk/PmpMyApp/source/pmpmapper.c

@@ -28 +28 @@
 
 /*!
- *      pmp_get_public(struct sockaddr_in *) will return a sockaddr_in
+ *      pmp_get_public() will return a sockaddr_in
  *      structure representing the publicly facing IP address of the 
  *      default NAT gateway. The function will return NULL if:
@@ -34 +34 @@
  *              - The gateway errors in some other spectacular fashion
  */
-struct sockaddr_in *pmp_get_public(struct sockaddr_in *gateway)
-{
+struct sockaddr_in *pmp_get_public()
+{
+        struct sockaddr_in *gateway = default_gw();
+        
         if (gateway == NULL)
         {
@@ -135 +137 @@
 
 /*!
- *      pmp_create_map(struct sockaddr_in *,uint8_t,uint16_t,uint16_t,uint32_t) 
+ *      pmp_create_map(uint8_t,uint16_t,uint16_t,uint32_t) 
  *      will return NULL on error, or a pointer to the pmp_map_response_t type
  */
-pmp_map_response_t *pmp_create_map(struct sockaddr_in *gateway, uint8_t type, uint16_t privateport, uint16_t publicport, uint32_t lifetime)
-{
+pmp_map_response_t *pmp_create_map(uint8_t type, uint16_t privateport, uint16_t publicport, uint32_t lifetime)
+{
+        struct sockaddr_in *gateway = default_gw();
+        
         if (gateway == NULL)
         {
@@ -231 +235 @@
 
 /*!
- *      pmp_destroy_map(struct sockaddr_in *,uint8_t,uint16_t) 
+ *      pmp_destroy_map(uint8_t,uint16_t) 
  *      will return NULL on error, or a pointer to the pmp_map_response_t type
  */
-pmp_map_response_t *pmp_destroy_map(struct sockaddr_in *gateway, uint8_t type, uint16_t privateport)
+pmp_map_response_t *pmp_destroy_map(uint8_t type, uint16_t privateport)
 {
         pmp_map_response_t *response = NULL;
         
-        if ((response = pmp_create_map(gateway, type, privateport, 0, 0)) == NULL)
+        if ((response = pmp_create_map(type, privateport, 0, 0)) == NULL)
         {
                 fprintf(stderr, "Failed to properly destroy mapping for %d!\n", privateport);

trunk/PmpMyApp/source/pmpmapper.h

@@ -24 +24 @@
 
 //      Comment out to disable building main()
-#define PMP_DEBUG
+//#define PMP_DEBUG
 
 #define PMP_VERSION             0
@@ -72 +72 @@
 } pmp_map_response_t;
 
-struct sockaddr_in *pmp_get_public(struct sockaddr_in *gateway);
-pmp_map_response_t *pmp_create_map(struct sockaddr_in *gateway, uint8_t type, uint16_t privateport, uint16_t publicport, uint32_t lifetime);
-pmp_map_response_t *pmp_destroy_map(struct sockaddr_in *gateway, uint8_t type, uint16_t privateport);
+struct sockaddr_in *pmp_get_public();
+pmp_map_response_t *pmp_create_map(uint8_t type, uint16_t privateport, uint16_t publicport, uint32_t lifetime);
+pmp_map_response_t *pmp_destroy_map(uint8_t type, uint16_t privateport);
         
 #endif