Skip to content

Commit

Permalink
Merge branch 'static-mosh' into raw
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Cabanero committed Nov 15, 2023
2 parents b3e9a65 + dec8482 commit cb37c2e
Show file tree
Hide file tree
Showing 22 changed files with 1,528 additions and 15 deletions.
42 changes: 37 additions & 5 deletions Blink.xcodeproj/project.pbxproj
View file
Expand Up @@ -94,6 +94,8 @@
BD1758AC26EA8C5400AEC545 /* MenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1758AB26EA8C5400AEC545 /* MenuController.swift */; };
BD19DB412B056E9C003A4367 /* SSHCommandTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD19DB402B056E9C003A4367 /* SSHCommandTest.swift */; };
BD2E27B529BAA8DA003AF1DA /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2E27B429BAA8DA003AF1DA /* ReplaySubject.swift */; };
BD33F7822AAA426D00CD16EE /* MoshBootstrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD33F7802AAA426D00CD16EE /* MoshBootstrap.swift */; };
BD33F7872AAA7C4300CD16EE /* MoshBootstrapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD33F7862AAA7C4300CD16EE /* MoshBootstrapTests.swift */; };
BD3E1E53278D190500333C44 /* Archive.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3E1E4F278D190500333C44 /* Archive.swift */; };
BD44DCE626D6BEAC00054338 /* BlinkItemIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD44DCE526D6BEAC00054338 /* BlinkItemIdentifier.swift */; };
BD67FC79272B30F300C1EE75 /* Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD67FC78272B30F300C1EE75 /* Messages.swift */; };
Expand All @@ -113,6 +115,10 @@
BD81522D2739A91D002BB169 /* BlinkLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9EA20A271F62ED00874007 /* BlinkLogging.swift */; };
BD81522E2739A91D002BB169 /* Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9EA20C271F664D00874007 /* Publisher.swift */; };
BD8152542743FF84002BB169 /* skstore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD8152532743FF84002BB169 /* skstore.swift */; };
BD818A052AAFC18400956488 /* mosh.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD818A042AAFC18400956488 /* mosh.swift */; };
BD818A0C2AB120B800956488 /* MoshServerParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD818A0B2AB120B800956488 /* MoshServerParams.swift */; };
BD818A132AB3865F00956488 /* MoshCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD818A122AB3865F00956488 /* MoshCommand.swift */; };
BD818A152AB3A40100956488 /* MoshClientParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD818A142AB3A40100956488 /* MoshClientParams.swift */; };
BD835DD427A0BD19002C37D7 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD835DD027A0BD19002C37D7 /* ReplaySubject.swift */; };
BD896F7B26CEAD37004313E6 /* FileTranslatorCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD896F7A26CEAD37004313E6 /* FileTranslatorCache.swift */; };
BD8BBF5525F829B00084705F /* SEKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD8BBF0825F819970084705F /* SEKeyTests.swift */; };
Expand Down Expand Up @@ -825,6 +831,8 @@
BD1758AB26EA8C5400AEC545 /* MenuController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuController.swift; sourceTree = "<group>"; };
BD19DB402B056E9C003A4367 /* SSHCommandTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSHCommandTest.swift; sourceTree = "<group>"; };
BD2E27B429BAA8DA003AF1DA /* ReplaySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplaySubject.swift; sourceTree = "<group>"; };
BD33F7802AAA426D00CD16EE /* MoshBootstrap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoshBootstrap.swift; sourceTree = "<group>"; };
BD33F7862AAA7C4300CD16EE /* MoshBootstrapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoshBootstrapTests.swift; sourceTree = "<group>"; };
BD3E1E4F278D190500333C44 /* Archive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Archive.swift; sourceTree = "<group>"; };
BD44DCE526D6BEAC00054338 /* BlinkItemIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlinkItemIdentifier.swift; sourceTree = "<group>"; };
BD67FC78272B30F300C1EE75 /* Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messages.swift; sourceTree = "<group>"; };
Expand All @@ -835,6 +843,10 @@
BD792A442A3B6A78009EE35F /* GitHubSnippets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubSnippets.swift; sourceTree = "<group>"; };
BD81521C27387D1F002BB169 /* Certificates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Certificates.swift; sourceTree = "<group>"; };
BD8152532743FF84002BB169 /* skstore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = skstore.swift; sourceTree = "<group>"; };
BD818A042AAFC18400956488 /* mosh.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = mosh.swift; sourceTree = "<group>"; };
BD818A0B2AB120B800956488 /* MoshServerParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoshServerParams.swift; sourceTree = "<group>"; };
BD818A122AB3865F00956488 /* MoshCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoshCommand.swift; sourceTree = "<group>"; };
BD818A142AB3A40100956488 /* MoshClientParams.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoshClientParams.swift; sourceTree = "<group>"; };
BD835DD027A0BD19002C37D7 /* ReplaySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplaySubject.swift; sourceTree = "<group>"; };
BD896F7A26CEAD37004313E6 /* FileTranslatorCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileTranslatorCache.swift; sourceTree = "<group>"; };
BD8BBF0825F819970084705F /* SEKeyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEKeyTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1685,6 +1697,18 @@
path = BlinkCode/Publisher;
sourceTree = SOURCE_ROOT;
};
BD33F77F2AAA426D00CD16EE /* mosh */ = {
isa = PBXGroup;
children = (
BD818A042AAFC18400956488 /* mosh.swift */,
BD33F7802AAA426D00CD16EE /* MoshBootstrap.swift */,
BD818A142AB3A40100956488 /* MoshClientParams.swift */,
BD818A122AB3865F00956488 /* MoshCommand.swift */,
BD818A0B2AB120B800956488 /* MoshServerParams.swift */,
);
path = mosh;
sourceTree = "<group>";
};
BD835DCF27A0BD19002C37D7 /* Publisher */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2085,14 +2109,15 @@
D265FBBB2317DD3C0017EAC4 /* BlinkTests */ = {
isa = PBXGroup;
children = (
D265FBBE2317DD3C0017EAC4 /* Info.plist */,
D20CBA56236031D700D93301 /* CompleteUtilsTests.swift */,
D265FBC42317E5090017EAC4 /* SessionParamsTests.swift */,
BD8BBF0825F819970084705F /* SEKeyTests.swift */,
BD9EA215271F83B400874007 /* BlinkLoggingTests.swift */,
BD74A7C12905BD5800ED01CF /* WhatsNewModelTests.swift */,
D20CBA56236031D700D93301 /* CompleteUtilsTests.swift */,
BDE7C45B29DCAEFA005E033E /* FileLocationPathTests.swift */,
BD19DB402B056E9C003A4367 /* SSHCommandTest.swift */,
D265FBBE2317DD3C0017EAC4 /* Info.plist */,
BD8BBF0825F819970084705F /* SEKeyTests.swift */,
D265FBC42317E5090017EAC4 /* SessionParamsTests.swift */,
BD74A7C12905BD5800ED01CF /* WhatsNewModelTests.swift */,
BD33F7862AAA7C4300CD16EE /* MoshBootstrapTests.swift */,
);
path = BlinkTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -2253,6 +2278,7 @@
D2F330C520A6C8E20074ADD7 /* Commands */ = {
isa = PBXGroup;
children = (
BD33F77F2AAA426D00CD16EE /* mosh */,
07FAB8E925C8E6C500E1CC2C /* ssh */,
D2334D1221495DAE00D26AC3 /* udptunnel */,
D240806020BC8DF800F30099 /* tool_main.c */,
Expand Down Expand Up @@ -3231,6 +3257,7 @@
D265FBC52317E5090017EAC4 /* SessionParamsTests.swift in Sources */,
BD9EA218271F846400874007 /* Publisher.swift in Sources */,
BD8BBF5525F829B00084705F /* SEKeyTests.swift in Sources */,
BD33F7872AAA7C4300CD16EE /* MoshBootstrapTests.swift in Sources */,
BD9EA216271F83B400874007 /* BlinkLoggingTests.swift in Sources */,
BD19DB412B056E9C003A4367 /* SSHCommandTest.swift in Sources */,
D20CBA57236031D700D93301 /* CompleteUtilsTests.swift in Sources */,
Expand All @@ -3254,6 +3281,7 @@
D241CBD923040734003D64A5 /* KBKeyView.swift in Sources */,
803B99D72582869200DC99C8 /* BKNotificationsView.swift in Sources */,
BD8152542743FF84002BB169 /* skstore.swift in Sources */,
BD818A052AAFC18400956488 /* mosh.swift in Sources */,
C94E9B631D6BA21C00DA4DD6 /* DismissSegue.m in Sources */,
D29B4A92274D206C00C66ED9 /* BrowserController.swift in Sources */,
803B99E3258381B200DC99C8 /* SettingsHostingController.swift in Sources */,
Expand Down Expand Up @@ -3310,6 +3338,7 @@
D2A52227231304FF0010AC04 /* UIGestureRecognizer.swift in Sources */,
D2AD8E7C27A2BAFA00DED28D /* PurchasePageView.swift in Sources */,
D22278012A26204900D4C708 /* EditorViewController.swift in Sources */,
BD818A152AB3A40100956488 /* MoshClientParams.swift in Sources */,
D266A9DC272A77A100C85EED /* code.swift in Sources */,
D2C24425238E44AB0082C69C /* KeyModifierPicker.swift in Sources */,
D259479C269C671F008B5305 /* MoshCustomOptionsPickerView.swift in Sources */,
Expand All @@ -3325,6 +3354,7 @@
BD9EA1FE271A148700874007 /* Migrator.swift in Sources */,
D2C24417238E44AB0082C69C /* KeyConfig.swift in Sources */,
D28F301A21AD8A6B00E5259F /* DeviceInfo.m in Sources */,
BD33F7822AAA426D00CD16EE /* MoshBootstrap.swift in Sources */,
D2179F2F2136DBC600B0850A /* geo.m in Sources */,
D2C24414238E44AB0082C69C /* KeyAction.swift in Sources */,
D28B0337243EF5F2008F38F6 /* Set+UIScene.swift in Sources */,
Expand Down Expand Up @@ -3355,6 +3385,7 @@
D264D2B228F84592002B1B14 /* GridView.swift in Sources */,
D2EFE1F520B7FAFC0087888B /* link_files.m in Sources */,
D2A54CB129801062009D79FE /* BuildAccountModel.swift in Sources */,
BD818A0C2AB120B800956488 /* MoshServerParams.swift in Sources */,
D2C24418238E44AB0082C69C /* KBConfigView.swift in Sources */,
D2BF5F7F265BA0A80070F839 /* UserDefaults.swift in Sources */,
D2F330CA20A6CB840074ADD7 /* help.m in Sources */,
Expand Down Expand Up @@ -3391,6 +3422,7 @@
D23EA9592604CB4C00BCF1FF /* FixedTextField.swift in Sources */,
D2C24437239104250082C69C /* ShortcutsConfigView.swift in Sources */,
B7D450361DD3A87200CE0DBE /* BKiCloudSyncHandler.m in Sources */,
BD818A132AB3865F00956488 /* MoshCommand.swift in Sources */,
D248E67622DDDF130057FE67 /* UIStateRestorable.swift in Sources */,
C9B2E0341D6B612400B89F69 /* BKTheme.m in Sources */,
D241CBD123040734003D64A5 /* KBKeyViewArrows.swift in Sources */,
Expand Down
4 changes: 4 additions & 0 deletions Blink/Blink-bridge.h
View file
Expand Up @@ -48,6 +48,8 @@ extern void __thread_ssh_execute_command(const char *command, socket_t in, socke
extern int ios_dup2(int fd1, int fd2);
extern void ios_exit(int errorCode) __dead2; // set error code and exits from the thread.

typedef void (*mosh_state_callback) (const void *context, const void *buffer, size_t size);

#import "BLKDefaults.h"
#import "UIDevice+DeviceName.h"
#import "BKHosts.h"
Expand All @@ -70,5 +72,7 @@ extern void ios_exit(int errorCode) __dead2; // set error code and exits from th
#import "TokioSignals.h"
#import "BlinkMenu.h"
#import "GeoManager.h"
#import "mosh/moshiosbridge.h"


#endif /* Blink_bridge_h */

0 comments on commit cb37c2e

Please sign in to comment.