xtaci · networkextension · Apr 28, 2017 · Apr 28, 2017 · Apr 28, 2017 · Apr 28, 2017
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ FEC enhanced KCP client session library for iOS/Android, compatible with [kcp-go
 1. Optimized for ***Online Games***.
 1. Stream based interface, you can easily switch from your TCP based protocol to libkcp or dualstack.
 1. [FEC(Forward Error Correction)](https://en.wikipedia.org/wiki/Forward_error_correction) Support with [Reed-Solomon Codes](https://en.wikipedia.org/wiki/Reed%E2%80%93Solomon_error_correction)
-
+1. Add iOS/macOs Framework and Test target 
+1. MAS app https://itunes.apple.com/us/app/a-big-t/id1114040100?l=zh&ls=1&mt=12 support kcptun use this lib
 ## ***Usage***
 libkcp has been designed as a ***Frame-Driven*** library, the main loop was supposed as:       
 ```
@@ -42,7 +43,7 @@ $go run kcpserver.go
 compile and run libkcp(Best with CLion), and watch output.      
 
 ## ***Caveats***
-1. Packet level encryption has not been implemented yet.
+1. Packet level encryption  use CommonCrypto, dose not pass test,need test and debug
 
 ## ***Troubleshooting***
 1. C++11 is required for compiling.
diff --git a/fec.cpp b/fec.cpp
@@ -47,7 +47,7 @@ FEC::Decode(byte *data, size_t sz) {
 void
 FEC::MarkData(byte *data, uint16_t sz) {
     data = encode32u(data,this->next);
-    data = encode16u(data,typeData);
+    data = encode16u(data,kcptypeData);
     encode16u(data,static_cast<uint16_t>(sz + 2)); // including size itself
     this->next++;
 }
@@ -125,7 +125,7 @@ FEC::Input(fecPacket &pkt) {
                 shardVec[seqid%totalShards] = rx[i].data;
                 shardflag[seqid%totalShards] = true;
                 numshard++;
-                if (rx[i].flag == typeData) {
+                if (rx[i].flag == kcptypeData) {
                     numDataShard++;
                 }
                 if (numshard == 1) {

diff --git a/fec.h b/fec.h
@@ -12,8 +12,9 @@
 #include "reedsolomon.h"
 
 const size_t fecHeaderSize = 6;
+//const size_t cryptHeaderSize = 20;//nonce 16 crc 4
 const size_t fecHeaderSizePlus2{fecHeaderSize + 2};
-const uint16_t typeData = 0xf1;
+const uint16_t kcptypeData = 0xf1;
 const uint16_t typeFEC = 0xf2;
 const int fecExpire = 30000;
 

diff --git a/iOSLib/libkcp/kcpOSX/Info.plist b/iOSLib/libkcp/kcpOSX/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2017 Kong XiangBo. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/iOSLib/libkcp/kcpOSX/kcp.h b/iOSLib/libkcp/kcpOSX/kcp.h
@@ -0,0 +1,21 @@
+//
+//  kcpOSX.h
+//  kcpOSX
+//
+//  Created by 孔祥波 on 02/06/2017.
+//  Copyright © 2017 Kong XiangBo. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for kcpOSX.
+FOUNDATION_EXPORT double kcpOSXVersionNumber;
+
+//! Project version string for kcpOSX.
+FOUNDATION_EXPORT const unsigned char kcpOSXVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <kcpOSX/PublicHeader.h>
+
+
+#import <kcp/Tunconfig.h>
+#import <kcp/SFKcptun.h>
diff --git a/iOSLib/libkcp/kcptest/AppDelegate.h b/iOSLib/libkcp/kcptest/AppDelegate.h
@@ -0,0 +1,17 @@
+//
+//  AppDelegate.h
+//  kcptest
+//
+//  Created by 孔祥波 on 28/04/2017.
+//  Copyright © 2017 Kong XiangBo. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+
+@end
+
diff --git a/iOSLib/libkcp/kcptest/AppDelegate.mm b/iOSLib/libkcp/kcptest/AppDelegate.mm
@@ -0,0 +1,51 @@
+//
+//  AppDelegate.m
+//  kcptest
+//
+//  Created by 孔祥波 on 28/04/2017.
+//  Copyright © 2017 Kong XiangBo. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@interface AppDelegate ()
+
+@end
+
+@implementation AppDelegate
+
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    // Override point for customization after application launch.
+    return YES;
+}
+
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+}
+
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+}
+
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
+
+@end
diff --git a/iOSLib/libkcp/kcptest/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOSLib/libkcp/kcptest/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/iOSLib/libkcp/kcptest/Base.lproj/LaunchScreen.storyboard b/iOSLib/libkcp/kcptest/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>