summary history branches tags files
commit:1fbd9b302504296d918eaec3222f5475445a3e28
author:mrmekon
committer:mrmekon
date:Sun Nov 13 12:12:46 2011 -0500
parents:f0c636668401a5e63b9392bdb6a2bdad22ff2900
Added mutex locks around some global acccesses.  Removed keychain functions from public interface -- done automatically now.  Added init() and close() function to spgp module to do necessary setup and breakdown.
diff --git a/simplepgp.xcodeproj/trevor.mode1v3 b/simplepgp.xcodeproj/trevor.mode1v3
line changes: +15/-16
index bd29df0..6ff826e
--- a/simplepgp.xcodeproj/trevor.mode1v3
+++ b/simplepgp.xcodeproj/trevor.mode1v3
@@ -229,8 +229,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -278,9 +276,9 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>27</integer>
-									<integer>26</integer>
-									<integer>25</integer>
+									<integer>14</integer>
+									<integer>13</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -303,7 +301,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>107 66 1174 810 0 0 1440 878 </string>
+						<string>91 68 1174 810 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -314,12 +312,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>packet_private.h</string>
+								<string>packet.c</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -327,11 +327,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>packet_private.h</string>
+										<string>packet.c</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>6926B15C146F617D00F69705</string>
+										<string>6926B1A91470319400F69705</string>
 										<key>history</key>
 										<array>
 											<string>69868BD91460F468004C5D9B</string>
@@ -339,13 +339,12 @@
 											<string>69269F5214620FC500F69705</string>
 											<string>6926ACA7146DC70D00F69705</string>
 											<string>6926ACA8146DC70D00F69705</string>
-											<string>6926ACAA146DC70D00F69705</string>
-											<string>6926ACD8146DC8A000F69705</string>
-											<string>6926AD0F146DC9D700F69705</string>
 											<string>6926AD1F146DCB4800F69705</string>
 											<string>6926AD20146DCB4800F69705</string>
 											<string>6926AD42146DDA7900F69705</string>
-											<string>6926B0FF146F5A7100F69705</string>
+											<string>6926B18414702F1900F69705</string>
+											<string>6926B1A81470319400F69705</string>
+											<string>6926B18314702F1900F69705</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -359,7 +358,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {966, 675}}</string>
 								<key>RubberWindowFrame</key>
-								<string>107 66 1174 810 0 0 1440 878 </string>
+								<string>91 68 1174 810 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -379,7 +378,7 @@
 								<key>Frame</key>
 								<string>{{0, 680}, {966, 89}}</string>
 								<key>RubberWindowFrame</key>
-								<string>107 66 1174 810 0 0 1440 878 </string>
+								<string>91 68 1174 810 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -549,7 +548,7 @@
 		<string>/Users/trevor/Documents/Cocoa Projects/libsimplepgp/simplepgp.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>107 66 1174 810 0 0 1440 878 </string>
+	<string>91 68 1174 810 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>

diff --git a/simplepgp.xcodeproj/trevor.pbxuser b/simplepgp.xcodeproj/trevor.pbxuser
line changes: +341/-244
index c2301eb..0a07f37
--- a/simplepgp.xcodeproj/trevor.pbxuser
+++ b/simplepgp.xcodeproj/trevor.pbxuser
@@ -10,7 +10,7 @@
 		);
 		breakpoints = (
 			69868C9D14618450004C5D9B /* packet.c:22 */,
-			69269F4E14620FC200F69705 /* packet.c:203 */,
+			69269F4E14620FC200F69705 /* packet.c:232 */,
 		);
 		codeSenseManager = 69868AD51460E35F004C5D9B /* Code sense */;
 		perUserDictionary = {
@@ -429,6 +429,14 @@
 			6926B14F146F5EB300F69705 /* PBXTextBookmark */ = 6926B14F146F5EB300F69705 /* PBXTextBookmark */;
 			6926B15B146F612C00F69705 /* PBXTextBookmark */ = 6926B15B146F612C00F69705 /* PBXTextBookmark */;
 			6926B15C146F617D00F69705 /* PBXTextBookmark */ = 6926B15C146F617D00F69705 /* PBXTextBookmark */;
+			6926B17D14702EF900F69705 /* PBXTextBookmark */ = 6926B17D14702EF900F69705 /* PBXTextBookmark */;
+			6926B18314702F1900F69705 /* PBXTextBookmark */ = 6926B18314702F1900F69705 /* PBXTextBookmark */;
+			6926B18414702F1900F69705 /* PBXTextBookmark */ = 6926B18414702F1900F69705 /* PBXTextBookmark */;
+			6926B18514702F1900F69705 /* PBXTextBookmark */ = 6926B18514702F1900F69705 /* PBXTextBookmark */;
+			6926B18614702F1900F69705 /* PBXTextBookmark */ = 6926B18614702F1900F69705 /* PBXTextBookmark */;
+			6926B18714702F1900F69705 /* PBXTextBookmark */ = 6926B18714702F1900F69705 /* PBXTextBookmark */;
+			6926B1A81470319400F69705 /* PBXTextBookmark */ = 6926B1A81470319400F69705 /* PBXTextBookmark */;
+			6926B1A91470319400F69705 /* PBXTextBookmark */ = 6926B1A91470319400F69705 /* PBXTextBookmark */;
 			69868BD11460F42D004C5D9B = 69868BD11460F42D004C5D9B /* PBXTextBookmark */;
 			69868BD91460F468004C5D9B = 69868BD91460F468004C5D9B /* PBXTextBookmark */;
 			69868C931460F7C3004C5D9B = 69868C931460F7C3004C5D9B /* PBXTextBookmark */;
@@ -453,9 +461,9 @@
 	};
 	69269F2314620D0F00F69705 /* packet.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {685, 21372}}";
-			sepNavSelRange = "{47236, 0}";
-			sepNavVisRange = "{37622, 342}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 21931}}";
+			sepNavSelRange = "{8711, 0}";
+			sepNavVisRange = "{7533, 1285}";
 			sepNavWindowFrame = "{{139, 11}, {1136, 746}}";
 		};
 	};
@@ -472,7 +480,7 @@
 			sepNavVisRange = "{0, 1510}";
 		};
 	};
-	69269F4E14620FC200F69705 /* packet.c:203 */ = {
+	69269F4E14620FC200F69705 /* packet.c:232 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -484,7 +492,7 @@
 		functionName = "spgp_decode_message()";
 		hitCount = 0;
 		ignoreCount = 0;
-		lineNumber = 203;
+		lineNumber = 232;
 		location = duckdog;
 		modificationTime = 342734490.62607;
 		originalNumberOfMultipleMatches = 1;
@@ -545,7 +553,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 816";
 		rLen = 0;
-		rLoc = 29061;
+		rLoc = 29945;
 		rType = 0;
 		vrLen = 1446;
 		vrLoc = 24434;
@@ -555,7 +563,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 820";
 		rLen = 0;
-		rLoc = 29229;
+		rLoc = 30113;
 		rType = 0;
 		vrLen = 1479;
 		vrLoc = 24016;
@@ -565,7 +573,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 791";
 		rLen = 0;
-		rLoc = 28228;
+		rLoc = 29112;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 27306;
@@ -575,7 +583,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 179";
 		rLen = 0;
-		rLoc = 6089;
+		rLoc = 6749;
 		rType = 0;
 		vrLen = 1966;
 		vrLoc = 4084;
@@ -585,7 +593,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 960";
 		rLen = 0;
-		rLoc = 50826;
+		rLoc = 51710;
 		rType = 0;
 		vrLen = 1655;
 		vrLoc = 28491;
@@ -595,7 +603,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 975";
 		rLen = 0;
-		rLoc = 50826;
+		rLoc = 51710;
 		rType = 0;
 		vrLen = 1799;
 		vrLoc = 28668;
@@ -605,7 +613,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 974";
 		rLen = 0;
-		rLoc = 50826;
+		rLoc = 51710;
 		rType = 0;
 		vrLen = 1802;
 		vrLoc = 28668;
@@ -615,7 +623,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 672";
 		rLen = 0;
-		rLoc = 23996;
+		rLoc = 24880;
 		rType = 0;
 		vrLen = 2232;
 		vrLoc = 19150;
@@ -625,7 +633,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 672";
 		rLen = 0;
-		rLoc = 23996;
+		rLoc = 24880;
 		rType = 0;
 		vrLen = 2232;
 		vrLoc = 19150;
@@ -635,7 +643,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 671";
 		rLen = 0;
-		rLoc = 23954;
+		rLoc = 24838;
 		rType = 0;
 		vrLen = 2244;
 		vrLoc = 19150;
@@ -645,7 +653,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 729";
 		rLen = 0;
-		rLoc = 25917;
+		rLoc = 26801;
 		rType = 0;
 		vrLen = 2063;
 		vrLoc = 21499;
@@ -655,7 +663,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 251";
 		rLen = 0;
-		rLoc = 8002;
+		rLoc = 8819;
 		rType = 0;
 		vrLen = 1791;
 		vrLoc = 6607;
@@ -685,7 +693,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 233";
 		rLen = 0;
-		rLoc = 7683;
+		rLoc = 8365;
 		rType = 0;
 		vrLen = 1575;
 		vrLoc = 6539;
@@ -695,7 +703,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 233";
 		rLen = 0;
-		rLoc = 7683;
+		rLoc = 8365;
 		rType = 0;
 		vrLen = 1575;
 		vrLoc = 6539;
@@ -715,7 +723,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 325";
 		rLen = 0;
-		rLoc = 11674;
+		rLoc = 12558;
 		rType = 0;
 		vrLen = 1425;
 		vrLoc = 8435;
@@ -725,7 +733,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 243";
 		rLen = 0;
-		rLoc = 8149;
+		rLoc = 8966;
 		rType = 0;
 		vrLen = 1663;
 		vrLoc = 6777;
@@ -735,7 +743,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 226";
 		rLen = 0;
-		rLoc = 7894;
+		rLoc = 8576;
 		rType = 0;
 		vrLen = 1673;
 		vrLoc = 6472;
@@ -755,7 +763,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 181";
 		rLen = 1;
-		rLoc = 6441;
+		rLoc = 7101;
 		rType = 0;
 		vrLen = 1900;
 		vrLoc = 4533;
@@ -765,7 +773,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 959";
 		rLen = 0;
-		rLoc = 44808;
+		rLoc = 45692;
 		rType = 0;
 		vrLen = 1765;
 		vrLoc = 29422;
@@ -775,7 +783,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 969";
 		rLen = 0;
-		rLoc = 45290;
+		rLoc = 46174;
 		rType = 0;
 		vrLen = 1684;
 		vrLoc = 29422;
@@ -795,7 +803,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 977";
 		rLen = 0;
-		rLoc = 45592;
+		rLoc = 46476;
 		rType = 0;
 		vrLen = 1601;
 		vrLoc = 29516;
@@ -805,7 +813,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 977";
 		rLen = 0;
-		rLoc = 45592;
+		rLoc = 46476;
 		rType = 0;
 		vrLen = 1598;
 		vrLoc = 29516;
@@ -815,7 +823,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 959";
 		rLen = 0;
-		rLoc = 44769;
+		rLoc = 45653;
 		rType = 0;
 		vrLen = 1633;
 		vrLoc = 29516;
@@ -825,7 +833,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 974";
 		rLen = 0;
-		rLoc = 45258;
+		rLoc = 46142;
 		rType = 0;
 		vrLen = 1643;
 		vrLoc = 29261;
@@ -835,7 +843,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 984";
 		rLen = 0;
-		rLoc = 45568;
+		rLoc = 46452;
 		rType = 0;
 		vrLen = 1637;
 		vrLoc = 29261;
@@ -845,7 +853,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46318;
+		rLoc = 47202;
 		rType = 0;
 		vrLen = 1784;
 		vrLoc = 30278;
@@ -865,7 +873,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46318;
+		rLoc = 47202;
 		rType = 0;
 		vrLen = 1784;
 		vrLoc = 30278;
@@ -875,7 +883,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46318;
+		rLoc = 47202;
 		rType = 0;
 		vrLen = 1847;
 		vrLoc = 30172;
@@ -895,7 +903,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 990";
 		rLen = 0;
-		rLoc = 45683;
+		rLoc = 46567;
 		rType = 0;
 		vrLen = 1796;
 		vrLoc = 29921;
@@ -905,7 +913,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1025";
 		rLen = 0;
-		rLoc = 49300;
+		rLoc = 50184;
 		rType = 0;
 		vrLen = 1708;
 		vrLoc = 30610;
@@ -925,7 +933,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1025";
 		rLen = 0;
-		rLoc = 49276;
+		rLoc = 50160;
 		rType = 0;
 		vrLen = 1740;
 		vrLoc = 30610;
@@ -935,7 +943,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1002";
 		rLen = 0;
-		rLoc = 45993;
+		rLoc = 46877;
 		rType = 0;
 		vrLen = 1864;
 		vrLoc = 29944;
@@ -955,7 +963,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1001";
 		rLen = 0;
-		rLoc = 45992;
+		rLoc = 46876;
 		rType = 0;
 		vrLen = 1801;
 		vrLoc = 30007;
@@ -965,23 +973,24 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 249";
 		rLen = 0;
-		rLoc = 8002;
+		rLoc = 8819;
 		rType = 0;
 		vrLen = 1363;
 		vrLoc = 6644;
 	};
 	6926A660146B38F200F69705 /* keychain.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {905, 1430}}";
-			sepNavSelRange = "{738, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 1469}}";
+			sepNavSelRange = "{1523, 34}";
 			sepNavVisRange = "{0, 1265}";
+			sepNavWindowFrame = "{{84, 64}, {1136, 746}}";
 		};
 	};
 	6926A661146B38F200F69705 /* keychain.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {905, 618}}";
-			sepNavSelRange = "{680, 0}";
-			sepNavVisRange = "{0, 1207}";
+			sepNavSelRange = "{730, 0}";
+			sepNavVisRange = "{0, 1189}";
 		};
 	};
 	6926A671146B39B700F69705 /* PBXTextBookmark */ = {
@@ -989,7 +998,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 50";
 		rLen = 0;
-		rLoc = 1053;
+		rLoc = 1054;
 		rType = 0;
 		vrLen = 1332;
 		vrLoc = 30243;
@@ -1019,7 +1028,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 17";
 		rLen = 18;
-		rLoc = 784;
+		rLoc = 763;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1029,7 +1038,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 17";
 		rLen = 18;
-		rLoc = 784;
+		rLoc = 763;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1039,7 +1048,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 16";
 		rLen = 0;
-		rLoc = 775;
+		rLoc = 754;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1049,7 +1058,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 49";
 		rLen = 25;
-		rLoc = 1119;
+		rLoc = 1319;
 		rType = 0;
 		vrLen = 1196;
 		vrLoc = 262;
@@ -1099,7 +1108,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 16";
 		rLen = 0;
-		rLoc = 775;
+		rLoc = 754;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1129,7 +1138,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 19";
 		rLen = 0;
-		rLoc = 881;
+		rLoc = 860;
 		rType = 0;
 		vrLen = 659;
 		vrLoc = 0;
@@ -1149,7 +1158,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3999;
+		rLoc = 4199;
 		rType = 0;
 		vrLen = 1411;
 		vrLoc = 30330;
@@ -1169,7 +1178,7 @@
 		fRef = 6926A660146B38F200F69705 /* keychain.c */;
 		name = "keychain.c: 88";
 		rLen = 0;
-		rLoc = 2447;
+		rLoc = 2492;
 		rType = 0;
 		vrLen = 1069;
 		vrLoc = 1014;
@@ -1179,7 +1188,7 @@
 		fRef = 6926A660146B38F200F69705 /* keychain.c */;
 		name = "keychain.c: 88";
 		rLen = 0;
-		rLoc = 2447;
+		rLoc = 2492;
 		rType = 0;
 		vrLen = 1035;
 		vrLoc = 1048;
@@ -1199,7 +1208,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3999;
+		rLoc = 4199;
 		rType = 0;
 		vrLen = 1432;
 		vrLoc = 31262;
@@ -1209,7 +1218,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3999;
+		rLoc = 4199;
 		rType = 0;
 		vrLen = 1432;
 		vrLoc = 31262;
@@ -1219,7 +1228,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1229,7 +1238,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1239,7 +1248,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1249,7 +1258,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31262;
@@ -1259,7 +1268,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31262;
@@ -1289,7 +1298,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1046";
 		rLen = 0;
-		rLoc = 49157;
+		rLoc = 50041;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1299,7 +1308,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 49080;
+		rLoc = 49964;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1309,7 +1318,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 49080;
+		rLoc = 49964;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1319,7 +1328,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1048";
 		rLen = 0;
-		rLoc = 49049;
+		rLoc = 49933;
 		rType = 0;
 		vrLen = 1333;
 		vrLoc = 31285;
@@ -1339,7 +1348,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1226";
 		rLen = 0;
-		rLoc = 50827;
+		rLoc = 51711;
 		rType = 0;
 		vrLen = 1307;
 		vrLoc = 36795;
@@ -1349,7 +1358,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1034";
 		rLen = 0;
-		rLoc = 47045;
+		rLoc = 47929;
 		rType = 0;
 		vrLen = 1205;
 		vrLoc = 30973;
@@ -1359,7 +1368,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46857;
+		rLoc = 47741;
 		rType = 0;
 		vrLen = 1408;
 		vrLoc = 30775;
@@ -1379,7 +1388,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46476;
+		rLoc = 47360;
 		rType = 0;
 		vrLen = 1492;
 		vrLoc = 31248;
@@ -1389,7 +1398,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 46952;
+		rLoc = 47836;
 		rType = 0;
 		vrLen = 1462;
 		vrLoc = 31147;
@@ -1399,7 +1408,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1048";
 		rLen = 0;
-		rLoc = 47174;
+		rLoc = 48058;
 		rType = 0;
 		vrLen = 1462;
 		vrLoc = 31147;
@@ -1409,7 +1418,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1049";
 		rLen = 0;
-		rLoc = 47118;
+		rLoc = 48002;
 		rType = 0;
 		vrLen = 1394;
 		vrLoc = 31415;
@@ -1419,7 +1428,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1049";
 		rLen = 0;
-		rLoc = 47118;
+		rLoc = 48002;
 		rType = 0;
 		vrLen = 1394;
 		vrLoc = 31415;
@@ -1429,7 +1438,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1029";
 		rLen = 0;
-		rLoc = 46343;
+		rLoc = 47227;
 		rType = 0;
 		vrLen = 1498;
 		vrLoc = 30842;
@@ -1439,7 +1448,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46420;
+		rLoc = 47304;
 		rType = 0;
 		vrLen = 1502;
 		vrLoc = 30842;
@@ -1449,7 +1458,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46420;
+		rLoc = 47304;
 		rType = 0;
 		vrLen = 1508;
 		vrLoc = 30842;
@@ -1469,7 +1478,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 970";
 		rLen = 119;
-		rLoc = 44406;
+		rLoc = 45290;
 		rType = 0;
 		vrLen = 1389;
 		vrLoc = 31415;
@@ -1479,7 +1488,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1250";
 		rLen = 0;
-		rLoc = 50827;
+		rLoc = 51711;
 		rType = 0;
 		vrLen = 1185;
 		vrLoc = 37615;
@@ -1489,7 +1498,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1250";
 		rLen = 0;
-		rLoc = 50827;
+		rLoc = 51711;
 		rType = 0;
 		vrLen = 1185;
 		vrLoc = 37619;
@@ -1499,7 +1508,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1039";
 		rLen = 0;
-		rLoc = 46704;
+		rLoc = 47588;
 		rType = 0;
 		vrLen = 1356;
 		vrLoc = 31419;
@@ -1509,7 +1518,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1064";
 		rLen = 0;
-		rLoc = 47556;
+		rLoc = 48440;
 		rType = 0;
 		vrLen = 1461;
 		vrLoc = 31857;
@@ -1519,7 +1528,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1062";
 		rLen = 0;
-		rLoc = 47416;
+		rLoc = 48300;
 		rType = 0;
 		vrLen = 1476;
 		vrLoc = 31764;
@@ -1530,7 +1539,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		fallbackIsa = XCBuildMessageTextBookmark;
 		rLen = 1;
-		rLoc = 1495;
+		rLoc = 1532;
 		rType = 1;
 	};
 	6926A7E1146B59BC00F69705 /* PBXTextBookmark */ = {
@@ -1538,7 +1547,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 978";
 		rLen = 0;
-		rLoc = 44740;
+		rLoc = 45624;
 		rType = 0;
 		vrLen = 1540;
 		vrLoc = 31881;
@@ -1548,7 +1557,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1064";
 		rLen = 0;
-		rLoc = 47556;
+		rLoc = 48440;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1568,7 +1577,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1065";
 		rLen = 0;
-		rLoc = 47543;
+		rLoc = 48427;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1578,7 +1587,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 47832;
+		rLoc = 48716;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31881;
@@ -1588,7 +1597,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1071";
 		rLen = 0;
-		rLoc = 47868;
+		rLoc = 48752;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1598,7 +1607,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 47707;
+		rLoc = 48591;
 		rType = 0;
 		vrLen = 1612;
 		vrLoc = 31913;
@@ -1618,7 +1627,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1067";
 		rLen = 0;
-		rLoc = 47598;
+		rLoc = 48482;
 		rType = 0;
 		vrLen = 1555;
 		vrLoc = 31987;
@@ -1628,7 +1637,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1067";
 		rLen = 0;
-		rLoc = 47598;
+		rLoc = 48482;
 		rType = 0;
 		vrLen = 1555;
 		vrLoc = 31987;
@@ -1638,7 +1647,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1073";
 		rLen = 0;
-		rLoc = 47874;
+		rLoc = 48758;
 		rType = 0;
 		vrLen = 1560;
 		vrLoc = 31987;
@@ -1658,7 +1667,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1073";
 		rLen = 0;
-		rLoc = 47874;
+		rLoc = 48758;
 		rType = 0;
 		vrLen = 1560;
 		vrLoc = 31987;
@@ -1668,7 +1677,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1075";
 		rLen = 0;
-		rLoc = 47948;
+		rLoc = 48832;
 		rType = 0;
 		vrLen = 1486;
 		vrLoc = 31987;
@@ -1678,7 +1687,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1086";
 		rLen = 0;
-		rLoc = 48308;
+		rLoc = 49192;
 		rType = 0;
 		vrLen = 1581;
 		vrLoc = 32939;
@@ -1688,7 +1697,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1088";
 		rLen = 0;
-		rLoc = 48308;
+		rLoc = 49192;
 		rType = 0;
 		vrLen = 1636;
 		vrLoc = 32363;
@@ -1698,7 +1707,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1088";
 		rLen = 0;
-		rLoc = 48308;
+		rLoc = 49192;
 		rType = 0;
 		vrLen = 1637;
 		vrLoc = 32362;
@@ -1708,7 +1717,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1089";
 		rLen = 0;
-		rLoc = 48308;
+		rLoc = 49192;
 		rType = 0;
 		vrLen = 1647;
 		vrLoc = 32362;
@@ -1718,7 +1727,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48362;
+		rLoc = 49246;
 		rType = 0;
 		vrLen = 1651;
 		vrLoc = 32366;
@@ -1728,7 +1737,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48362;
+		rLoc = 49246;
 		rType = 0;
 		vrLen = 1651;
 		vrLoc = 32366;
@@ -1738,7 +1747,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48362;
+		rLoc = 49246;
 		rType = 0;
 		vrLen = 1658;
 		vrLoc = 32366;
@@ -1748,7 +1757,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48362;
+		rLoc = 49246;
 		rType = 0;
 		vrLen = 1658;
 		vrLoc = 32366;
@@ -1758,7 +1767,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48362;
+		rLoc = 49246;
 		rType = 0;
 		vrLen = 1543;
 		vrLoc = 32544;
@@ -1768,7 +1777,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1096";
 		rLen = 0;
-		rLoc = 48515;
+		rLoc = 49399;
 		rType = 0;
 		vrLen = 1484;
 		vrLoc = 32775;
@@ -1778,7 +1787,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16804;
+		rLoc = 17688;
 		rType = 0;
 		vrLen = 1856;
 		vrLoc = 11348;
@@ -1788,7 +1797,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16804;
+		rLoc = 17688;
 		rType = 0;
 		vrLen = 1886;
 		vrLoc = 11348;
@@ -1798,7 +1807,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16804;
+		rLoc = 17688;
 		rType = 0;
 		vrLen = 1864;
 		vrLoc = 11538;
@@ -1808,7 +1817,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16804;
+		rLoc = 17688;
 		rType = 0;
 		vrLen = 1858;
 		vrLoc = 11538;
@@ -1818,7 +1827,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 470";
 		rLen = 0;
-		rLoc = 17914;
+		rLoc = 18798;
 		rType = 0;
 		vrLen = 1250;
 		vrLoc = 13332;
@@ -1838,7 +1847,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 444";
 		rLen = 0;
-		rLoc = 16804;
+		rLoc = 17688;
 		rType = 0;
 		vrLen = 1464;
 		vrLoc = 12557;
@@ -1848,7 +1857,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1865;
+		rLoc = 2065;
 		rType = 0;
 		vrLen = 1528;
 		vrLoc = 12678;
@@ -1858,7 +1867,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1865;
+		rLoc = 2065;
 		rType = 0;
 		vrLen = 1528;
 		vrLoc = 12678;
@@ -1868,7 +1877,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1865;
+		rLoc = 2065;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 12678;
@@ -1878,7 +1887,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1865;
+		rLoc = 2065;
 		rType = 0;
 		vrLen = 1530;
 		vrLoc = 12679;
@@ -1888,7 +1897,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1865;
+		rLoc = 2065;
 		rType = 0;
 		vrLen = 1530;
 		vrLoc = 12679;
@@ -1918,7 +1927,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 139";
 		rLen = 54;
-		rLoc = 4773;
+		rLoc = 5433;
 		rType = 0;
 		vrLen = 1692;
 		vrLoc = 5114;
@@ -1928,7 +1937,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1012";
 		rLen = 0;
-		rLoc = 42240;
+		rLoc = 43124;
 		rType = 0;
 		vrLen = 1382;
 		vrLoc = 30008;
@@ -1938,7 +1947,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1007";
 		rLen = 0;
-		rLoc = 38338;
+		rLoc = 39222;
 		rType = 0;
 		vrLen = 1403;
 		vrLoc = 30374;
@@ -1948,7 +1957,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1017";
 		rLen = 0;
-		rLoc = 38723;
+		rLoc = 39607;
 		rType = 0;
 		vrLen = 1491;
 		vrLoc = 30915;
@@ -1968,7 +1977,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1017";
 		rLen = 0;
-		rLoc = 38755;
+		rLoc = 39639;
 		rType = 0;
 		vrLen = 1495;
 		vrLoc = 30915;
@@ -1978,7 +1987,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1012";
 		rLen = 0;
-		rLoc = 38501;
+		rLoc = 39385;
 		rType = 0;
 		vrLen = 1481;
 		vrLoc = 30905;
@@ -1988,7 +1997,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1040";
 		rLen = 0;
-		rLoc = 39714;
+		rLoc = 40598;
 		rType = 0;
 		vrLen = 1427;
 		vrLoc = 30905;
@@ -2008,7 +2017,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 42240;
+		rLoc = 43124;
 		rType = 0;
 		vrLen = 1420;
 		vrLoc = 30908;
@@ -2018,7 +2027,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1050";
 		rLen = 119;
-		rLoc = 44406;
+		rLoc = 45290;
 		rType = 0;
 		vrLen = 1509;
 		vrLoc = 31655;
@@ -2038,7 +2047,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 44240;
+		rLoc = 45124;
 		rType = 0;
 		vrLen = 1317;
 		vrLoc = 32232;
@@ -2048,7 +2057,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1062";
 		rLen = 0;
-		rLoc = 44387;
+		rLoc = 45271;
 		rType = 0;
 		vrLen = 1285;
 		vrLoc = 32232;
@@ -2058,7 +2067,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1030";
 		rLen = 0;
-		rLoc = 38905;
+		rLoc = 39789;
 		rType = 0;
 		vrLen = 1417;
 		vrLoc = 31218;
@@ -2068,7 +2077,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1030";
 		rLen = 0;
-		rLoc = 38905;
+		rLoc = 39789;
 		rType = 0;
 		vrLen = 1417;
 		vrLoc = 31218;
@@ -2078,7 +2087,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38905;
+		rLoc = 39789;
 		rType = 0;
 		vrLen = 1392;
 		vrLoc = 31253;
@@ -2088,7 +2097,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38905;
+		rLoc = 39789;
 		rType = 0;
 		vrLen = 1392;
 		vrLoc = 31253;
@@ -2098,7 +2107,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38905;
+		rLoc = 39789;
 		rType = 0;
 		vrLen = 1451;
 		vrLoc = 31194;
@@ -2108,7 +2117,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 436";
 		rLen = 0;
-		rLoc = 17021;
+		rLoc = 17905;
 		rType = 0;
 		vrLen = 1818;
 		vrLoc = 11735;
@@ -2118,7 +2127,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 436";
 		rLen = 0;
-		rLoc = 17021;
+		rLoc = 17905;
 		rType = 0;
 		vrLen = 1451;
 		vrLoc = 12773;
@@ -2128,7 +2137,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17027;
+		rLoc = 17911;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2138,7 +2147,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17027;
+		rLoc = 17911;
 		rType = 0;
 		vrLen = 1523;
 		vrLoc = 12550;
@@ -2148,7 +2157,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17027;
+		rLoc = 17911;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2158,7 +2167,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17027;
+		rLoc = 17911;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2168,7 +2177,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 31834;
@@ -2178,7 +2187,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 31834;
@@ -2188,7 +2197,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1635;
 		vrLoc = 31881;
@@ -2198,7 +2207,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1635;
 		vrLoc = 31881;
@@ -2208,7 +2217,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1634;
 		vrLoc = 31881;
@@ -2218,7 +2227,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 454";
 		rLen = 0;
-		rLoc = 17464;
+		rLoc = 18348;
 		rType = 0;
 		vrLen = 1502;
 		vrLoc = 12734;
@@ -2228,7 +2237,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1076";
 		rLen = 0;
-		rLoc = 40386;
+		rLoc = 41270;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 32022;
@@ -2248,7 +2257,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 41634;
+		rLoc = 42518;
 		rType = 0;
 		vrLen = 1776;
 		vrLoc = 32146;
@@ -2258,7 +2267,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 177";
 		rLen = 0;
-		rLoc = 5479;
+		rLoc = 6139;
 		rType = 0;
 		vrLen = 1558;
 		vrLoc = 5039;
@@ -2268,7 +2277,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 210";
 		rLen = 0;
-		rLoc = 6511;
+		rLoc = 7171;
 		rType = 0;
 		vrLen = 1859;
 		vrLoc = 5449;
@@ -2278,7 +2287,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1020";
 		rLen = 211;
-		rLoc = 38034;
+		rLoc = 38918;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 33567;
@@ -2288,7 +2297,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1020";
 		rLen = 211;
-		rLoc = 38034;
+		rLoc = 38918;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 33567;
@@ -2298,7 +2307,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1119";
 		rLen = 0;
-		rLoc = 42021;
+		rLoc = 42905;
 		rType = 0;
 		vrLen = 1634;
 		vrLoc = 33895;
@@ -2308,7 +2317,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1070";
 		rLen = 0;
-		rLoc = 39714;
+		rLoc = 40598;
 		rType = 0;
 		vrLen = 1725;
 		vrLoc = 32525;
@@ -2328,7 +2337,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1037";
 		rLen = 0;
-		rLoc = 38005;
+		rLoc = 38889;
 		rType = 0;
 		vrLen = 1329;
 		vrLoc = 31486;
@@ -2338,7 +2347,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1041";
 		rLen = 0;
-		rLoc = 37622;
+		rLoc = 38506;
 		rType = 0;
 		vrLen = 1193;
 		vrLoc = 32102;
@@ -2348,7 +2357,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1035";
 		rLen = 0;
-		rLoc = 36798;
+		rLoc = 37682;
 		rType = 0;
 		vrLen = 1145;
 		vrLoc = 32098;
@@ -2358,7 +2367,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 37566;
+		rLoc = 38450;
 		rType = 0;
 		vrLen = 1164;
 		vrLoc = 32098;
@@ -2411,7 +2420,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 37566;
+		rLoc = 38450;
 		rType = 0;
 		vrLen = 1164;
 		vrLoc = 32098;
@@ -2421,7 +2430,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1031";
 		rLen = 0;
-		rLoc = 34953;
+		rLoc = 35837;
 		rType = 0;
 		vrLen = 1078;
 		vrLoc = 32098;
@@ -2431,7 +2440,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 36550;
+		rLoc = 37434;
 		rType = 0;
 		vrLen = 1055;
 		vrLoc = 32098;
@@ -2442,7 +2451,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		fallbackIsa = XCBuildMessageTextBookmark;
 		rLen = 1;
-		rLoc = 1495;
+		rLoc = 1532;
 		rType = 1;
 	};
 	6926A9D2146C759700F69705 /* PBXTextBookmark */ = {
@@ -2450,7 +2459,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1287";
 		rLen = 0;
-		rLoc = 47236;
+		rLoc = 48120;
 		rType = 0;
 		vrLen = 193;
 		vrLoc = 37053;
@@ -2460,7 +2469,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1139";
 		rLen = 0;
-		rLoc = 40080;
+		rLoc = 40964;
 		rType = 0;
 		vrLen = 1815;
 		vrLoc = 34704;
@@ -2470,7 +2479,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1147";
 		rLen = 899;
-		rLoc = 40435;
+		rLoc = 41319;
 		rType = 0;
 		vrLen = 1908;
 		vrLoc = 34706;
@@ -2480,7 +2489,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1153";
 		rLen = 0;
-		rLoc = 40757;
+		rLoc = 41641;
 		rType = 0;
 		vrLen = 2044;
 		vrLoc = 35207;
@@ -2490,7 +2499,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1178";
 		rLen = 0;
-		rLoc = 41759;
+		rLoc = 42643;
 		rType = 0;
 		vrLen = 2065;
 		vrLoc = 35634;
@@ -2500,7 +2509,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 35652;
+		rLoc = 36536;
 		rType = 0;
 		vrLen = 1109;
 		vrLoc = 32174;
@@ -2510,7 +2519,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1037";
 		rLen = 0;
-		rLoc = 35494;
+		rLoc = 36378;
 		rType = 0;
 		vrLen = 1119;
 		vrLoc = 32174;
@@ -2530,7 +2539,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 10;
-		rLoc = 35691;
+		rLoc = 36575;
 		rType = 0;
 		vrLen = 1150;
 		vrLoc = 32174;
@@ -2540,7 +2549,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 35674;
+		rLoc = 36558;
 		rType = 0;
 		vrLen = 1147;
 		vrLoc = 32174;
@@ -2550,7 +2559,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 36458;
+		rLoc = 37342;
 		rType = 0;
 		vrLen = 1124;
 		vrLoc = 32174;
@@ -2560,7 +2569,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1050";
 		rLen = 0;
-		rLoc = 35674;
+		rLoc = 36558;
 		rType = 0;
 		vrLen = 1104;
 		vrLoc = 32174;
@@ -2570,7 +2579,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1053";
 		rLen = 0;
-		rLoc = 35889;
+		rLoc = 36773;
 		rType = 0;
 		vrLen = 1137;
 		vrLoc = 32174;
@@ -2580,7 +2589,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1055";
 		rLen = 0;
-		rLoc = 36397;
+		rLoc = 37281;
 		rType = 0;
 		vrLen = 1142;
 		vrLoc = 32174;
@@ -2590,7 +2599,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1036";
 		rLen = 0;
-		rLoc = 35230;
+		rLoc = 36114;
 		rType = 0;
 		vrLen = 1150;
 		vrLoc = 32174;
@@ -2600,7 +2609,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1061";
 		rLen = 0;
-		rLoc = 36112;
+		rLoc = 36996;
 		rType = 0;
 		vrLen = 1122;
 		vrLoc = 32174;
@@ -2610,7 +2619,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 37241;
+		rLoc = 38125;
 		rType = 0;
 		vrLen = 1297;
 		vrLoc = 32706;
@@ -2620,7 +2629,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 441";
 		rLen = 0;
-		rLoc = 16417;
+		rLoc = 17301;
 		rType = 0;
 		vrLen = 1908;
 		vrLoc = 12417;
@@ -2630,7 +2639,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 442";
 		rLen = 0;
-		rLoc = 16323;
+		rLoc = 17207;
 		rType = 0;
 		vrLen = 1779;
 		vrLoc = 12746;
@@ -2640,7 +2649,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1099";
 		rLen = 0;
-		rLoc = 37531;
+		rLoc = 38415;
 		rType = 0;
 		vrLen = 1295;
 		vrLoc = 33118;
@@ -2650,7 +2659,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 445";
 		rLen = 0;
-		rLoc = 16417;
+		rLoc = 17301;
 		rType = 0;
 		vrLen = 1757;
 		vrLoc = 12940;
@@ -2680,7 +2689,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1059";
 		rLen = 0;
-		rLoc = 35898;
+		rLoc = 36782;
 		rType = 0;
 		vrLen = 1177;
 		vrLoc = 32255;
@@ -2690,7 +2699,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36447;
+		rLoc = 37331;
 		rType = 0;
 		vrLen = 1182;
 		vrLoc = 32235;
@@ -2700,7 +2709,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36439;
+		rLoc = 37323;
 		rType = 0;
 		vrLen = 1192;
 		vrLoc = 32235;
@@ -2720,7 +2729,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36439;
+		rLoc = 37323;
 		rType = 0;
 		vrLen = 1192;
 		vrLoc = 32235;
@@ -2730,7 +2739,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36344;
+		rLoc = 37228;
 		rType = 0;
 		vrLen = 1206;
 		vrLoc = 32235;
@@ -2740,7 +2749,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36306;
+		rLoc = 37190;
 		rType = 0;
 		vrLen = 1234;
 		vrLoc = 32235;
@@ -2760,7 +2769,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36306;
+		rLoc = 37190;
 		rType = 0;
 		vrLen = 1234;
 		vrLoc = 32235;
@@ -2770,7 +2779,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 35379;
+		rLoc = 36263;
 		rType = 0;
 		vrLen = 1271;
 		vrLoc = 32235;
@@ -2780,7 +2789,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 35646;
+		rLoc = 36530;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 32262;
@@ -2820,7 +2829,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 35646;
+		rLoc = 36530;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 32262;
@@ -2830,7 +2839,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 212";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1596;
 		vrLoc = 4866;
@@ -2840,7 +2849,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 298";
 		rLen = 0;
-		rLoc = 7395;
+		rLoc = 8055;
 		rType = 0;
 		vrLen = 1521;
 		vrLoc = 9063;
@@ -2860,7 +2869,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1173";
 		rLen = 0;
-		rLoc = 37782;
+		rLoc = 38666;
 		rType = 0;
 		vrLen = 1361;
 		vrLoc = 35270;
@@ -2870,7 +2879,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 217";
 		rLen = 0;
-		rLoc = 4861;
+		rLoc = 5521;
 		rType = 0;
 		vrLen = 1216;
 		vrLoc = 7015;
@@ -2880,7 +2889,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2890,7 +2899,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2900,7 +2909,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 184";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2910,7 +2919,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1756;
 		vrLoc = 5299;
@@ -2920,7 +2929,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 190";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1786;
 		vrLoc = 5299;
@@ -2930,7 +2939,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1134";
 		rLen = 0;
-		rLoc = 36306;
+		rLoc = 37190;
 		rType = 0;
 		vrLen = 1423;
 		vrLoc = 34344;
@@ -2940,7 +2949,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35375;
+		rLoc = 36259;
 		rType = 0;
 		vrLen = 1485;
 		vrLoc = 35523;
@@ -2950,7 +2959,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35375;
+		rLoc = 36259;
 		rType = 0;
 		vrLen = 1485;
 		vrLoc = 35523;
@@ -2960,7 +2969,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35375;
+		rLoc = 36259;
 		rType = 0;
 		vrLen = 1381;
 		vrLoc = 34415;
@@ -2970,7 +2979,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1121";
 		rLen = 0;
-		rLoc = 35747;
+		rLoc = 36631;
 		rType = 0;
 		vrLen = 1375;
 		vrLoc = 34119;
@@ -2980,7 +2989,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1144";
 		rLen = 0;
-		rLoc = 36535;
+		rLoc = 37419;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 34544;
@@ -2990,7 +2999,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1127";
 		rLen = 0;
-		rLoc = 36010;
+		rLoc = 36894;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 34544;
@@ -3000,7 +3009,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1124";
 		rLen = 0;
-		rLoc = 35864;
+		rLoc = 36748;
 		rType = 0;
 		vrLen = 1411;
 		vrLoc = 34544;
@@ -3010,7 +3019,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41304;
+		rLoc = 42188;
 		rType = 0;
 		vrLen = 1880;
 		vrLoc = 39504;
@@ -3020,7 +3029,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41331;
+		rLoc = 42215;
 		rType = 0;
 		vrLen = 1884;
 		vrLoc = 39504;
@@ -3030,7 +3039,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1278";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 1881;
 		vrLoc = 39504;
@@ -3040,7 +3049,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1281";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 2087;
 		vrLoc = 38355;
@@ -3050,7 +3059,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1281";
 		rLen = 0;
-		rLoc = 41363;
+		rLoc = 42247;
 		rType = 0;
 		vrLen = 2087;
 		vrLoc = 38355;
@@ -3060,7 +3069,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41331;
+		rLoc = 42215;
 		rType = 0;
 		vrLen = 2091;
 		vrLoc = 38355;
@@ -3070,7 +3079,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 183";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1879;
 		vrLoc = 5538;
@@ -3080,7 +3089,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 183";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1879;
 		vrLoc = 5538;
@@ -3090,7 +3099,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1184";
 		rLen = 0;
-		rLoc = 38001;
+		rLoc = 38885;
 		rType = 0;
 		vrLen = 1433;
 		vrLoc = 35814;
@@ -3100,7 +3109,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 204";
 		rLen = 0;
-		rLoc = 4757;
+		rLoc = 5417;
 		rType = 0;
 		vrLen = 1737;
 		vrLoc = 6105;
@@ -3110,7 +3119,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1198";
 		rLen = 0;
-		rLoc = 37918;
+		rLoc = 38802;
 		rType = 0;
 		vrLen = 1219;
 		vrLoc = 36144;
@@ -3150,7 +3159,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1344";
 		rLen = 0;
-		rLoc = 43091;
+		rLoc = 43975;
 		rType = 0;
 		vrLen = 1542;
 		vrLoc = 41396;
@@ -3160,7 +3169,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1344";
 		rLen = 0;
-		rLoc = 43091;
+		rLoc = 43975;
 		rType = 0;
 		vrLen = 1542;
 		vrLoc = 41396;
@@ -3170,7 +3179,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43078;
+		rLoc = 43962;
 		rType = 0;
 		vrLen = 1602;
 		vrLoc = 41258;
@@ -3180,7 +3189,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1349";
 		rLen = 0;
-		rLoc = 43204;
+		rLoc = 44088;
 		rType = 0;
 		vrLen = 1653;
 		vrLoc = 41258;
@@ -3190,7 +3199,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1352";
 		rLen = 0;
-		rLoc = 43488;
+		rLoc = 44372;
 		rType = 0;
 		vrLen = 1725;
 		vrLoc = 41258;
@@ -3200,7 +3209,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1354";
 		rLen = 0;
-		rLoc = 43488;
+		rLoc = 44372;
 		rType = 0;
 		vrLen = 1698;
 		vrLoc = 41258;
@@ -3210,7 +3219,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1354";
 		rLen = 0;
-		rLoc = 43432;
+		rLoc = 44316;
 		rType = 0;
 		vrLen = 1699;
 		vrLoc = 41258;
@@ -3220,7 +3229,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1356";
 		rLen = 0;
-		rLoc = 43490;
+		rLoc = 44374;
 		rType = 0;
 		vrLen = 1472;
 		vrLoc = 42122;
@@ -3230,7 +3239,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43034;
+		rLoc = 43918;
 		rType = 0;
 		vrLen = 1629;
 		vrLoc = 41950;
@@ -3240,7 +3249,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43034;
+		rLoc = 43918;
 		rType = 0;
 		vrLen = 1629;
 		vrLoc = 41950;
@@ -3250,7 +3259,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1371";
 		rLen = 0;
-		rLoc = 43769;
+		rLoc = 44653;
 		rType = 0;
 		vrLen = 1666;
 		vrLoc = 41950;
@@ -3260,7 +3269,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1339";
 		rLen = 0;
-		rLoc = 42609;
+		rLoc = 43493;
 		rType = 0;
 		vrLen = 1625;
 		vrLoc = 41950;
@@ -3270,7 +3279,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1379";
 		rLen = 0;
-		rLoc = 44003;
+		rLoc = 44887;
 		rType = 0;
 		vrLen = 1393;
 		vrLoc = 42689;
@@ -3290,7 +3299,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 347";
 		rLen = 0;
-		rLoc = 9708;
+		rLoc = 10525;
 		rType = 0;
 		vrLen = 1144;
 		vrLoc = 10747;
@@ -3300,7 +3309,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 335";
 		rLen = 0;
-		rLoc = 9252;
+		rLoc = 10069;
 		rType = 0;
 		vrLen = 1083;
 		vrLoc = 11237;
@@ -3317,7 +3326,7 @@
 		fRef = 6926A660146B38F200F69705 /* keychain.c */;
 		name = "keychain.c: 88";
 		rLen = 0;
-		rLoc = 2447;
+		rLoc = 2492;
 		rType = 0;
 		vrLen = 1032;
 		vrLoc = 201;
@@ -3327,7 +3336,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 335";
 		rLen = 0;
-		rLoc = 9252;
+		rLoc = 10069;
 		rType = 0;
 		vrLen = 1083;
 		vrLoc = 11237;
@@ -3427,7 +3436,7 @@
 		fRef = 6926A660146B38F200F69705 /* keychain.c */;
 		name = "keychain.c: 88";
 		rLen = 0;
-		rLoc = 2447;
+		rLoc = 2492;
 		rType = 0;
 		vrLen = 1032;
 		vrLoc = 201;
@@ -3507,7 +3516,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 303";
 		rLen = 0;
-		rLoc = 8002;
+		rLoc = 8819;
 		rType = 0;
 		vrLen = 959;
 		vrLoc = 8934;
@@ -3517,7 +3526,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 284";
 		rLen = 0;
-		rLoc = 8002;
+		rLoc = 8819;
 		rType = 0;
 		vrLen = 1270;
 		vrLoc = 8934;
@@ -3863,7 +3872,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1614";
 		rLen = 0;
-		rLoc = 50827;
+		rLoc = 51711;
 		rType = 0;
 		vrLen = 1263;
 		vrLoc = 49545;
@@ -3967,9 +3976,9 @@
 	};
 	6926AD00146DC9BD00F69705 /* packet_private.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {905, 2769}}";
-			sepNavSelRange = "{361, 0}";
-			sepNavVisRange = "{0, 1231}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 2808}}";
+			sepNavSelRange = "{827, 0}";
+			sepNavVisRange = "{362, 1189}";
 		};
 	};
 	6926AD03146DC9BD00F69705 /* util.c */ = {
@@ -4073,12 +4082,20 @@
 		vrLen = 1420;
 		vrLoc = 0;
 	};
+	6926AD2B146DDA1900F69705 /* simplepgp.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1077, 1222}}";
+			sepNavSelRange = "{1265, 0}";
+			sepNavVisRange = "{753, 1477}";
+			sepNavWindowFrame = "{{107, 43}, {1136, 746}}";
+		};
+	};
 	6926AD2F146DDA4700F69705 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1496";
 		rLen = 0;
-		rLoc = 47236;
+		rLoc = 48120;
 		rType = 0;
 		vrLen = 261;
 		vrLoc = 37622;
@@ -4198,7 +4215,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1496";
 		rLen = 0;
-		rLoc = 47236;
+		rLoc = 48120;
 		rType = 0;
 		vrLen = 342;
 		vrLoc = 37622;
@@ -4238,7 +4255,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1496";
 		rLen = 0;
-		rLoc = 47236;
+		rLoc = 48120;
 		rType = 0;
 		vrLen = 342;
 		vrLoc = 37622;
@@ -4273,6 +4290,86 @@
 		vrLen = 1231;
 		vrLoc = 0;
 	};
+	6926B17D14702EF900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69269F2314620D0F00F69705 /* packet.c */;
+		name = "packet.c: 1527";
+		rLen = 0;
+		rLoc = 48120;
+		rType = 0;
+		vrLen = 284;
+		vrLoc = 37550;
+	};
+	6926B18314702F1900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69269F2314620D0F00F69705 /* packet.c */;
+		name = "packet.c: 749";
+		rLen = 0;
+		rLoc = 23253;
+		rType = 0;
+		vrLen = 1925;
+		vrLoc = 22388;
+	};
+	6926B18414702F1900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926A660146B38F200F69705 /* keychain.c */;
+		name = "keychain.c: 63";
+		rLen = 34;
+		rLoc = 1523;
+		rType = 0;
+		vrLen = 1265;
+		vrLoc = 0;
+	};
+	6926B18514702F1900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926A661146B38F200F69705 /* keychain.h */;
+		name = "keychain.h: 26";
+		rLen = 0;
+		rLoc = 730;
+		rType = 0;
+		vrLen = 1189;
+		vrLoc = 0;
+	};
+	6926B18614702F1900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 40";
+		rLen = 35;
+		rLoc = 1037;
+		rType = 0;
+		vrLen = 1202;
+		vrLoc = 362;
+	};
+	6926B18714702F1900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 31";
+		rLen = 0;
+		rLoc = 827;
+		rType = 0;
+		vrLen = 1189;
+		vrLoc = 362;
+	};
+	6926B1A81470319400F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 31";
+		rLen = 0;
+		rLoc = 827;
+		rType = 0;
+		vrLen = 1189;
+		vrLoc = 362;
+	};
+	6926B1A91470319400F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69269F2314620D0F00F69705 /* packet.c */;
+		name = "packet.c: 273";
+		rLen = 0;
+		rLoc = 8711;
+		rType = 0;
+		vrLen = 1285;
+		vrLoc = 7533;
+	};
 	69868AD41460E35F004C5D9B /* Source Control */ = {
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;

diff --git a/src/keychain.c b/src/keychain.c
line changes: +2/-3
index 5216ee2..f36a2b5
--- a/src/keychain.c
+++ b/src/keychain.c
@@ -85,7 +85,7 @@ uint8_t spgp_keychain_add_packet(spgp_packet_t *pkt) {
 uint8_t spgp_keychain_del_packet(spgp_packet_t *pkt) {
   pthread_mutex_lock(&keychain_mtx);
   pthread_mutex_unlock(&keychain_mtx);
-
+  LOG_PRINT("PACKET DELETE UNIMPLEMENTED\n");
 	return -1;
 }
 
@@ -106,8 +106,7 @@ spgp_packet_t *spgp_keychain_iter_next(void) {
 
 spgp_packet_t *spgp_keychain_secret_key_with_id(uint8_t *keyid) {
   pthread_mutex_lock(&keychain_mtx);
-
   pthread_mutex_unlock(&keychain_mtx);
-
+	LOG_PRINT("SECRET KEY SEARCH UNIMPLEMENTED\n");
 	return NULL;
 }

diff --git a/src/keychain.h b/src/keychain.h
line changes: +0/-1
index 4aa8285..1ad466d
--- a/src/keychain.h
+++ b/src/keychain.h
@@ -23,7 +23,6 @@
 #ifndef _KEYCHAIN_H
 
 #include <stdint.h>
-#include <pthread.h>
 #include "simplepgp.h"
 
 

diff --git a/src/packet.c b/src/packet.c
line changes: +37/-0
index b44e1de..4bd5f50
--- a/src/packet.c
+++ b/src/packet.c
@@ -40,6 +40,15 @@
 **
 ***********************************************************************/
 
+
+
+/**********************************************************************
+**
+** Extern variables
+**
+***********************************************************************/
+
+pthread_mutex_t spgp_mtx;
 uint32_t _spgp_err;
 jmp_buf exception;
 
@@ -131,6 +140,26 @@ static uint8_t spgp_read_iv(uint8_t *msg,
 ***********************************************************************/
 #pragma mark External Function Definitions
 
+uint8_t spgp_init(void) {
+	if (pthread_mutex_init(&spgp_mtx, NULL)) return -1;
+  if (spgp_keychain_init()) return -1;
+  return 0;
+}
+
+uint8_t spgp_close(void) {
+	spgp_packet_t *chain = NULL;
+  if (spgp_keychain_is_valid()) {
+    spgp_keychain_iter_start();
+    while ((chain = spgp_keychain_iter_next()) != NULL) {
+    	spgp_free_packet(&chain);
+    }
+    spgp_keychain_iter_end();
+    spgp_keychain_free();
+	}
+
+	pthread_mutex_destroy(&spgp_mtx);
+  return 0;
+}
 
 spgp_packet_t *spgp_decode_message(uint8_t *message, uint32_t length) {
 	spgp_packet_t *head = NULL;
@@ -225,6 +254,7 @@ uint8_t spgp_decrypt_all_secret_keys(spgp_packet_t *msg,
                                 		 uint8_t *passphrase, uint32_t length) {
 	spgp_packet_t *cur = msg;
   uint8_t err = 0;
+  uint8_t haskey = 0;
   
 	if (setjmp(exception)) {
     	LOG_PRINT("Exception (0x%x)\n",_spgp_err);
@@ -237,8 +267,13 @@ uint8_t spgp_decrypt_all_secret_keys(spgp_packet_t *msg,
   	LOG_PRINT("Decrypting secret key\n");
   	spgp_decrypt_secret_key(cur, passphrase, length);
   	cur = cur->next;
+    haskey = 1;
   }
   
+  // Add decrypted keys to keychain
+  if (haskey)
+  	if (spgp_keychain_add_packet(msg) != 0) RAISE(KEYCHAIN_ERROR);
+  
   end:
   return err;
 }
@@ -379,7 +414,9 @@ uint8_t spgp_debug_log_enabled(void) {
 	return debug_log_enabled;
 }
 void spgp_debug_log_set(uint8_t enable) {
+	pthread_mutex_lock(&spgp_mtx);
 	debug_log_enabled = enable;
+  pthread_mutex_unlock(&spgp_mtx);
 }
 
 

diff --git a/src/packet_private.h b/src/packet_private.h
line changes: +4/-0
index 950894a..71174d9
--- a/src/packet_private.h
+++ b/src/packet_private.h
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <setjmp.h>
+#include <pthread.h>
 
 
 /**********************************************************************
@@ -37,8 +38,10 @@
 #pragma mark Macros
 
 #define RAISE(err) do { \
+		pthread_mutex_lock(&spgp_mtx); \
 		_spgp_err = (err); \
     LOG_PRINT("raise 0x%X\n",_spgp_err); \
+		pthread_mutex_unlock(&spgp_mtx); \
     longjmp(exception,_spgp_err); \
   } while(0)
 
@@ -56,6 +59,7 @@
   } } while(0)
 
 
+extern pthread_mutex_t spgp_mtx;
 extern uint8_t debug_log_enabled;
 extern uint32_t _spgp_err;
 extern jmp_buf exception;

diff --git a/src/simplepgp.h b/src/simplepgp.h
line changes: +3/-0
index 5d7555e..2d7b132
--- a/src/simplepgp.h
+++ b/src/simplepgp.h
@@ -34,6 +34,9 @@ typedef struct spgp_userid_packet_struct  spgp_userid_pkt_t;
 typedef struct spgp_session_packet_struct spgp_session_pkt_t;
 typedef struct spgp_literal_packet_struct spgp_literal_pkt_t;
 
+uint8_t spgp_init(void);
+uint8_t spgp_close(void);
+
 
 /**
  * Break a binary OpenPGP message into decoded packets.