github/vncproxy
1
0
Fork 0
mirror of https://github.com/amitbet/vncproxy.git synced 2025-08-31 12:48:30 +00:00
Code Issues Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
amit bezalel
2017-07-21 16:09:27 +03:00
parent 952cd69365
commit 34528de10f
7 changed files with 303 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.idea/libraries/GOPATH__vncproxy_.xml generated
View File

@@ -1,35 +1,47 @@
<component name="libraryTable">
<library name="GOPATH &lt;vncproxy&gt;">
<CLASSES>
<root url="file://$PROJECT_DIR$/../srf.storage" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
<root url="file://$PROJECT_DIR$/../elastictrail" />
<root url="file://$PROJECT_DIR$/../gopkg.in" />
<root url="file://$PROJECT_DIR$/../srf.opb" />
<root url="file://$PROJECT_DIR$/../GoProjExample" />
<root url="file://$PROJECT_DIR$/../github.com" />
<root url="file://$PROJECT_DIR$/../golang.org" />
<root url="file://$PROJECT_DIR$/../sourcegraph.com" />
<root url="file://$PROJECT_DIR$/../srf.storage" />
<root url="file://$PROJECT_DIR$/../govmomi-fork" />
<root url="file://$PROJECT_DIR$/../vncproxy1" />
<root url="file://$PROJECT_DIR$/../GoProjExample" />
<root url="file://$PROJECT_DIR$/../govmomi-fork" />
<root url="file://$PROJECT_DIR$/../srf.opb" />
<root url="file://$PROJECT_DIR$/../vshpere-cli" />
<root url="file://$PROJECT_DIR$/../sourcegraph.com" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/github.com" />
<root url="file://$PROJECT_DIR$/../github.com" />
<root url="file://$PROJECT_DIR$/../experience.center.opb" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/gopkg.in" />
<root url="file://$PROJECT_DIR$/../golang.org" />
<root url="file://$PROJECT_DIR$/../srf-test-exporter" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/golang.org" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/srf" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/version" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/../srf.storage" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
<root url="file://$PROJECT_DIR$/../elastictrail" />
<root url="file://$PROJECT_DIR$/../gopkg.in" />
<root url="file://$PROJECT_DIR$/../srf.opb" />
<root url="file://$PROJECT_DIR$/../GoProjExample" />
<root url="file://$PROJECT_DIR$/../github.com" />
<root url="file://$PROJECT_DIR$/../golang.org" />
<root url="file://$PROJECT_DIR$/../sourcegraph.com" />
<root url="file://$PROJECT_DIR$/../srf.storage" />
<root url="file://$PROJECT_DIR$/../govmomi-fork" />
<root url="file://$PROJECT_DIR$/../vncproxy1" />
<root url="file://$PROJECT_DIR$/../GoProjExample" />
<root url="file://$PROJECT_DIR$/../govmomi-fork" />
<root url="file://$PROJECT_DIR$/../srf.opb" />
<root url="file://$PROJECT_DIR$/../vshpere-cli" />
<root url="file://$PROJECT_DIR$/../sourcegraph.com" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/github.com" />
<root url="file://$PROJECT_DIR$/../github.com" />
<root url="file://$PROJECT_DIR$/../experience.center.opb" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/gopkg.in" />
<root url="file://$PROJECT_DIR$/../golang.org" />
<root url="file://$PROJECT_DIR$/../srf-test-exporter" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/golang.org" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/srf" />
<root url="file://$USER_HOME$/srf/experience.center.opb/src/version" />
</SOURCES>
<excluded>
<root url="file://$PROJECT_DIR$" />

491
.idea/workspace.xml generated
View File

@@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a5d84862-9821-4d30-9a77-6235b55d6727" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/GOPATH__vncproxy_.xml" afterPath="$PROJECT_DIR$/.idea/libraries/GOPATH__vncproxy_.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/player/player_test.go" afterPath="$PROJECT_DIR$/player/player_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/handlers.go" afterPath="$PROJECT_DIR$/server/handlers.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -26,7 +24,6 @@
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="vncproxy" />
</component>
@@ -35,7 +32,7 @@
<file leaf-file-name="ws-server-go.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/ws-server-go.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<state relative-caret-position="120">
<caret line="15" column="10" lean-forward="false" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
<folding />
</state>
@@ -45,7 +42,7 @@
<file leaf-file-name="server-conn.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/server-conn.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3726">
<state relative-caret-position="3105">
<caret line="214" column="5" lean-forward="false" selection-start-line="214" selection-start-column="5" selection-end-line="214" selection-end-column="5" />
<folding />
</state>
@@ -55,7 +52,7 @@
<file leaf-file-name="server-message-type.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/common/server-message-type.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<state relative-caret-position="45">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
@@ -65,7 +62,7 @@
<file leaf-file-name="pointer.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/client/pointer.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<state relative-caret-position="105">
<caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
<folding />
</state>
@@ -75,7 +72,7 @@
<file leaf-file-name="server_test.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/server_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<state relative-caret-position="465">
<caret line="36" column="27" lean-forward="false" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
<folding />
</state>
@@ -95,7 +92,7 @@
<file leaf-file-name="server.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/server.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<state relative-caret-position="270">
<caret line="24" column="1" lean-forward="false" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
<folding />
</state>
@@ -105,7 +102,7 @@
<file leaf-file-name="security.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/security.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1350">
<state relative-caret-position="1125">
<caret line="82" column="0" lean-forward="false" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
<folding>
<element signature="e#16#100#0" expanded="true" />
@@ -117,8 +114,8 @@
<file leaf-file-name="handlers.go" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/server/handlers.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<state relative-caret-position="1125">
<caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
<folding />
</state>
</provider>
@@ -182,7 +179,6 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/vnc/pixel-format.go" />
<option value="$PROJECT_DIR$/server/handlers.go" />
<option value="$PROJECT_DIR$/server/ws-test.go" />
<option value="$PROJECT_DIR$/client/pixel-format.go" />
<option value="$PROJECT_DIR$/server/ws-server.go" />
@@ -215,6 +211,7 @@
<option value="$PROJECT_DIR$/server/server_test.go" />
<option value="$PROJECT_DIR$/server/ws-server-go.go" />
<option value="$PROJECT_DIR$/server/server-conn.go" />
<option value="$PROJECT_DIR$/server/handlers.go" />
</list>
</option>
</component>
@@ -227,11 +224,11 @@
<component name="MavenProjectNavigator">
<treeState />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1176" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="140" />
<option name="y" value="154" />
<option name="width" value="1680" />
<option name="height" value="1023" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -286,9 +283,24 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
<item name="vncproxy" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
<item name="vncproxy" type="462c0819:PsiDirectoryNode" />
<item name="server" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="ProjectPane" />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
@@ -314,12 +326,175 @@
</option>
</component>
<component name="RunManager">
<configuration name="Server" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\server\main.go" />
<kind value="FILE" />
<package value="vncproxy" />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<module />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
</configuration>
<configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
<option name="BCName" value="" />
<option name="IOSSimulatorSdkPath" value="" />
<option name="adlOptions" value="" />
<option name="airProgramParameters" value="" />
<option name="appDescriptorForEmulator" value="Android" />
<option name="debugTransport" value="USB" />
<option name="debuggerSdkRaw" value="BC SDK" />
<option name="emulator" value="NexusOne" />
<option name="emulatorAdlOptions" value="" />
<option name="fastPackaging" value="true" />
<option name="fullScreenHeight" value="0" />
<option name="fullScreenWidth" value="0" />
<option name="launchUrl" value="false" />
<option name="launcherParameters">
<LauncherParameters>
<option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<option name="launcherType" value="OSDefault" />
<option name="newPlayerInstance" value="false" />
<option name="playerPath" value="FlashPlayerDebugger.exe" />
</LauncherParameters>
</option>
<option name="mobileRunTarget" value="Emulator" />
<option name="moduleName" value="" />
<option name="overriddenMainClass" value="" />
<option name="overriddenOutputFileName" value="" />
<option name="overrideMainClass" value="false" />
<option name="runTrusted" value="true" />
<option name="screenDpi" value="0" />
<option name="screenHeight" value="0" />
<option name="screenWidth" value="0" />
<option name="url" value="http://" />
<option name="usbDebugPort" value="7936" />
</configuration>
<configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
<option name="BCName" value="" />
<option name="launcherParameters">
<LauncherParameters>
<option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<option name="launcherType" value="OSDefault" />
<option name="newPlayerInstance" value="false" />
<option name="playerPath" value="FlashPlayerDebugger.exe" />
</LauncherParameters>
</option>
<option name="moduleName" value="" />
<option name="trusted" value="true" />
</configuration>
<configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
<kind value="FILE" />
<package value="vncproxy" />
</configuration>
<configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="DIRECTORY" />
<package value="vncproxy" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
<setting name="vmparams" value="" />
<setting name="cmdLine" value="run-app" />
<setting name="passParentEnv" value="true" />
<setting name="launchBrowser" value="true" />
<setting name="launchBrowserUrl" value="" />
<setting name="depsClasspath" value="false" />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" />
<method />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
</configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="" />
@@ -376,29 +551,6 @@
</Profilers>
<method />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<module />
<method />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
<method />
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -480,69 +632,11 @@
<envs />
<method />
</configuration>
<configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
<option name="BCName" value="" />
<option name="IOSSimulatorSdkPath" value="" />
<option name="adlOptions" value="" />
<option name="airProgramParameters" value="" />
<option name="appDescriptorForEmulator" value="Android" />
<option name="debugTransport" value="USB" />
<option name="debuggerSdkRaw" value="BC SDK" />
<option name="emulator" value="NexusOne" />
<option name="emulatorAdlOptions" value="" />
<option name="fastPackaging" value="true" />
<option name="fullScreenHeight" value="0" />
<option name="fullScreenWidth" value="0" />
<option name="launchUrl" value="false" />
<option name="launcherParameters">
<LauncherParameters>
<option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<option name="launcherType" value="OSDefault" />
<option name="newPlayerInstance" value="false" />
<option name="playerPath" value="FlashPlayerDebugger.exe" />
</LauncherParameters>
</option>
<option name="mobileRunTarget" value="Emulator" />
<option name="moduleName" value="" />
<option name="overriddenMainClass" value="" />
<option name="overriddenOutputFileName" value="" />
<option name="overrideMainClass" value="false" />
<option name="runTrusted" value="true" />
<option name="screenDpi" value="0" />
<option name="screenHeight" value="0" />
<option name="screenWidth" value="0" />
<option name="url" value="http://" />
<option name="usbDebugPort" value="7936" />
<method />
</configuration>
<configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
<option name="BCName" value="" />
<option name="launcherParameters">
<LauncherParameters>
<option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<option name="launcherType" value="OSDefault" />
<option name="newPlayerInstance" value="false" />
<option name="playerPath" value="FlashPlayerDebugger.exe" />
</LauncherParameters>
</option>
<option name="moduleName" value="" />
<option name="trusted" value="true" />
<method />
</configuration>
<configuration default="true" type="GoAppEngineRunConfiguration" factoryName="Go App Engine">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<method />
</configuration>
<configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
<kind value="FILE" />
<package value="vncproxy" />
<method />
</configuration>
<configuration default="true" type="GoRemoteDebugConfigurationType" factoryName="Go Remote">
<method />
</configuration>
@@ -552,17 +646,6 @@
<filePath value="$PROJECT_DIR$" />
<method />
</configuration>
<configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="DIRECTORY" />
<package value="vncproxy" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$" />
<method />
</configuration>
<configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
@@ -579,36 +662,6 @@
</ExternalSystemSettings>
<method />
</configuration>
<configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
<setting name="vmparams" value="" />
<setting name="cmdLine" value="run-app" />
<setting name="passParentEnv" value="true" />
<setting name="launchBrowser" value="true" />
<setting name="launchBrowserUrl" value="" />
<setting name="depsClasspath" value="false" />
<method />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="true" type="JarApplication" factoryName="JAR Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<envs />
@@ -671,57 +724,12 @@
<envs />
<method />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<method />
</configuration>
<configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<envs />
<method />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run" />
<scripts />
@@ -735,24 +743,14 @@
<configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
<method />
</configuration>
<configuration default="false" name="Server" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
<filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\server\main.go" />
<kind value="FILE" />
<package value="vncproxy" />
<method />
</configuration>
<configuration default="false" name="main" type="GoApplicationRunConfiguration" factoryName="Go Application">
<configuration name="main" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="vncproxy" />
<working_directory value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
<go_parameters value="-i" />
<filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\main.go" />
<kind value="FILE" />
<method />
</configuration>
<configuration default="false" name="test player" type="GoTestRunConfiguration" factoryName="Go Test">
<configuration name="test player" type="GoTestRunConfiguration" factoryName="Go Test">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
@@ -761,9 +759,8 @@
<package value="vncproxy/player" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/player" />
<method />
</configuration>
<configuration default="false" name="test proxy" type="GoTestRunConfiguration" factoryName="Go Test">
<configuration name="test proxy" type="GoTestRunConfiguration" factoryName="Go Test">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
@@ -772,9 +769,8 @@
<package value="vncproxy" />
<directory value="$PROJECT_DIR$/proxy/proxy_test.go" />
<filePath value="$PROJECT_DIR$/proxy/proxy_test.go" />
<method />
</configuration>
<configuration default="false" name="test server " type="GoTestRunConfiguration" factoryName="Go Test">
<configuration name="test server " type="GoTestRunConfiguration" factoryName="Go Test">
<module name="vncproxy" />
<working_directory value="$PROJECT_DIR$" />
<go_parameters value="-i" />
@@ -783,7 +779,6 @@
<package value="vncproxy" />
<directory value="$PROJECT_DIR$/server/server_test.go" />
<filePath value="$PROJECT_DIR$/server/server_test.go" />
<method />
</configuration>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Go Application.Server" />
@@ -821,6 +816,7 @@
<workItem from="1500413400696" duration="152000" />
<workItem from="1500413585910" duration="2404000" />
<workItem from="1500531144911" duration="595000" />
<workItem from="1500560041309" duration="115000" />
</task>
<servers />
</component>
@@ -857,7 +853,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68383000" />
<option name="totallyTimeSpent" value="68498000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -869,24 +865,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="7" />
<frame x="0" y="23" width="1680" height="1023" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49030694" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26366252" sideWeight="0.54846525" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26293105" sideWeight="0.54846525" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22420909" sideWeight="0.49353796" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.4676898" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49030694" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32569295" sideWeight="0.6718266" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32967034" sideWeight="0.6718266" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.21506849" sideWeight="0.49676898" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3029079" sideWeight="0.48367348" order="6" side_tool="false" content_ui="tabs" />
@@ -896,8 +890,10 @@
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35068494" sideWeight="0.687399" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2714055" sideWeight="0.32817337" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -907,7 +903,7 @@
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="processedProjectFiles" value="true" />
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
@@ -1041,11 +1037,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2520">
<caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
<folding>
<marker date="1500414972000" expanded="false" signature="22:26" ph="..." />
<marker date="1500414972000" expanded="true" signature="5096:5097" ph="{...}" />
<marker date="1500414972000" expanded="true" signature="5096:5101" ph="{...}" />
</folding>
</state>
</provider>
</entry>
@@ -1096,7 +1087,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="237" column="7" lean-forward="false" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
@@ -1148,7 +1138,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="238" column="10" lean-forward="true" selection-start-line="238" selection-start-column="10" selection-end-line="238" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
@@ -1177,56 +1166,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="678">
<caret line="60" column="32" lean-forward="true" selection-start-line="60" selection-start-column="32" selection-end-line="60" selection-end-column="32" />
<folding>
<marker date="1500415821000" expanded="true" signature="1158:3178" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3052:3126" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3052:3130" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3052:3133" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3180:3455" ph="/.../" />
<marker date="1500415821000" expanded="true" signature="3490:3539" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3636:3831" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3712:3747" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="3880:3994" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4039:4052" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4166:4984" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4267:4289" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4401:4423" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4515:4537" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4628:4960" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4683:4727" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4756:4851" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4821:4847" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="4986:5085" ph="/.../" />
<marker date="1500415821000" expanded="true" signature="5186:5201" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5236:5290" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5321:5334" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5430:5459" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5575:5590" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5632:5693" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5731:5768" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5881:6310" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="5964:5986" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6069:6091" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6176:6198" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6270:6292" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6312:6417" ph="/.../" />
<marker date="1500415821000" expanded="true" signature="6447:6463" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6555:6745" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6631:6661" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6789:6852" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="6892:6905" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="7017:7398" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="7020:7089" ph="/.../" />
<marker date="1500415821000" expanded="true" signature="7164:7186" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="7237:7259" ph="{...}" />
<marker date="1500415821000" expanded="true" signature="7323:7345" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/server-message-type.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<state relative-caret-position="45">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
@@ -1235,7 +1180,7 @@
<entry file="file://$PROJECT_DIR$/common/multiListener.go" />
<entry file="file://$PROJECT_DIR$/client/pointer.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<state relative-caret-position="105">
<caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
<folding />
</state>
@@ -1251,7 +1196,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/server/server.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<state relative-caret-position="270">
<caret line="24" column="1" lean-forward="false" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
<folding />
</state>
@@ -1260,7 +1205,7 @@
<entry file="file://$PROJECT_DIR$/server/ws_test.go" />
<entry file="file://$PROJECT_DIR$/server/ws-server-go.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<state relative-caret-position="120">
<caret line="15" column="10" lean-forward="false" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
<folding />
</state>
@@ -1268,7 +1213,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/server/server-conn.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3726">
<state relative-caret-position="3105">
<caret line="214" column="5" lean-forward="false" selection-start-line="214" selection-start-column="5" selection-end-line="214" selection-end-column="5" />
<folding />
</state>
@@ -1276,7 +1221,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/server/security.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1350">
<state relative-caret-position="1125">
<caret line="82" column="0" lean-forward="false" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
<folding>
<element signature="e#16#100#0" expanded="true" />
@@ -1286,7 +1231,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/server/server_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<state relative-caret-position="465">
<caret line="36" column="27" lean-forward="false" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
<folding />
</state>
@@ -1294,8 +1239,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/server/handlers.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<state relative-caret-position="1125">
<caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
<folding />
</state>
</provider>

37
encodings/enc-tight.go
View File

@@ -61,22 +61,22 @@ func (t *TightEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangl
compctl, err := r.ReadUint8()
if err != nil {
logger.Debugf("error in handling tight encoding: %v\n", err)
logger.Errorf("error in handling tight encoding: %v", err)
return nil, err
}
logger.Debugf("bytesPixel= %d, subencoding= %d\n", bytesPixel, compctl)
logger.Debugf("bytesPixel= %d, subencoding= %d", bytesPixel, compctl)
//move it to position (remove zlib flush commands)
compType := compctl >> 4 & 0x0F
logger.Debugf("afterSHL:%d\n", compType)
logger.Debugf("afterSHL:%d", compType)
switch compType {
case TightFill:
logger.Debugf("reading fill size=%d\n", bytesPixel)
//read color
_, err := r.ReadBytes(int(bytesPixel))
if err != nil {
logger.Debugf("error in handling tight encoding: %v\n", err)
logger.Errorf("error in handling tight encoding: %v", err)
return nil, err
}
@@ -121,15 +121,15 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
filterid, err = r.ReadUint8()
if err != nil {
logger.Debugf("error in handling tight encoding, reading filterid: %v\n", err)
logger.Errorf("error in handling tight encoding, reading filterid: %v", err)
return
}
logger.Debugf("read filter: %d\n", filterid)
logger.Debugf("handleTightFilters: read filter: %d\n", filterid)
}
bytesPixel := calcTightBytePerPixel(pixelFmt)
logger.Debugf("filter: %d\n", filterid)
logger.Debugf("handleTightFilters: filter: %d\n", filterid)
lengthCurrentbpp := int(bytesPixel) * int(rect.Width) * int(rect.Height)
@@ -137,10 +137,19 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
case TightFilterPalette: //PALETTE_FILTER
colorCount, err := r.ReadUint8()
if err != nil {
logger.Errorf("handleTightFilters: error in handling tight encoding, reading TightFilterPalette: %v", err)
return
}
paletteSize := colorCount + 1 // add one more
logger.Debugf("----PALETTE_FILTER: paletteSize=%d bytesPixel=%d\n", paletteSize, bytesPixel)
logger.Debugf("handleTightFilters: ----PALETTE_FILTER: paletteSize=%d bytesPixel=%d\n", paletteSize, bytesPixel)
//complete palette
_, err = r.ReadBytes(int(paletteSize) * bytesPixel)
if err != nil {
logger.Errorf("handleTightFilters: error in handling tight encoding, reading TightFilterPalette.paletteSize: %v", err)
return
}
var dataLength int
if paletteSize == 2 {
@@ -150,7 +159,7 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
}
_, err = r.ReadTightData(dataLength)
if err != nil {
logger.Debugf("error in handling tight encoding, Reading Palette: %v\n", err)
logger.Errorf("handleTightFilters: error in handling tight encoding, Reading Palette: %v", err)
return
}
@@ -159,20 +168,22 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
logger.Debugf("usegrad: %d\n", filterid)
_, err := r.ReadTightData(lengthCurrentbpp)
if err != nil {
logger.Debugf("error in handling tight encoding, Reading GRADIENT_FILTER: %v\n", err)
logger.Errorf("handleTightFilters: error in handling tight encoding, Reading GRADIENT_FILTER: %v", err)
return
}
case TightFilterCopy: //BASIC_FILTER
logger.Debugf("----BASIC_FILTER: bytesPixel=%d\n", bytesPixel)
//lengthCurrentbpp1 := int(pixelFmt.BPP/8) * int(rect.Width) * int(rect.Height)
logger.Debugf("handleTightFilters: ----BASIC_FILTER: bytesPixel=%d", bytesPixel)
_, err := r.ReadTightData(lengthCurrentbpp)
if err != nil {
logger.Debugf("error in handling tight encoding, Reading BASIC_FILTER: %v\n", err)
logger.Errorf("handleTightFilters: error in handling tight encoding, Reading BASIC_FILTER: %v", err)
return
}
default:
logger.Debugf("Bad tight filter id: %d\n", filterid)
logger.Errorf("handleTightFilters: Bad tight filter id: %d", filterid)
return
}

41
logger/logger.go
View File

@@ -30,8 +30,12 @@ type SimpleLogger struct {
func (sl *SimpleLogger) Debug(v ...interface{}) {
if sl.level <= LogLevelDebug {
fmt.Print("[Debug] ")
fmt.Println(v...)
arr := []interface{}{"[Debug]"}
for _, item := range v {
arr = append(arr, item)
}
fmt.Println(arr...)
}
}
func (sl *SimpleLogger) Debugf(format string, v ...interface{}) {
@@ -41,30 +45,39 @@ func (sl *SimpleLogger) Debugf(format string, v ...interface{}) {
}
func (sl *SimpleLogger) Info(v ...interface{}) {
if sl.level <= LogLevelInfo {
fmt.Print("[Info] ")
fmt.Println(v...)
arr := []interface{}{"[Info ]"}
for _, item := range v {
arr = append(arr, item)
}
fmt.Println(arr...)
}
}
func (sl *SimpleLogger) Infof(format string, v ...interface{}) {
if sl.level <= LogLevelInfo {
fmt.Printf("[Info] "+format+"\n", v...)
fmt.Printf("[Info ] "+format+"\n", v...)
}
}
func (sl *SimpleLogger) Warn(v ...interface{}) {
if sl.level <= LogLevelWarn {
fmt.Print("[Warn] ")
fmt.Println(v...)
arr := []interface{}{"[Warn ]"}
for _, item := range v {
arr = append(arr, item)
}
fmt.Println(arr...)
}
}
func (sl *SimpleLogger) Warnf(format string, v ...interface{}) {
if sl.level <= LogLevelWarn {
fmt.Printf("[Warn] "+format+"\n", v...)
fmt.Printf("[Warn ] "+format+"\n", v...)
}
}
func (sl *SimpleLogger) Error(v ...interface{}) {
if sl.level <= LogLevelError {
fmt.Print("[Error] ")
fmt.Println(v...)
arr := []interface{}{"[Error]"}
for _, item := range v {
arr = append(arr, item)
}
fmt.Println(arr...)
}
}
func (sl *SimpleLogger) Errorf(format string, v ...interface{}) {
@@ -74,8 +87,12 @@ func (sl *SimpleLogger) Errorf(format string, v ...interface{}) {
}
func (sl *SimpleLogger) Fatal(v ...interface{}) {
if sl.level <= LogLevelFatal {
fmt.Print("[Fatal] ")
fmt.Println(v...)
arr := []interface{}{"[Fatal]"}
for _, item := range v {
arr = append(arr, item)
}
fmt.Println(arr...)
}
}
func (sl *SimpleLogger) Fatalf(format string, v ...interface{}) {

3
proxy/message-listeners.go
View File

@@ -43,7 +43,7 @@ type ServerUpdater struct {
func (p *ServerUpdater) Consume(seg *common.RfbSegment) error {
logger.Debugf("WriteTo.Consume (ServerUpdater): got segment type=%s", seg.SegmentType)
logger.Debugf("WriteTo.Consume (ServerUpdater): got segment type=%s, object type:%d", seg.SegmentType, seg.UpcomingObjectType)
switch seg.SegmentType {
case common.SegmentMessageSeparator:
case common.SegmentRectSeparator:
@@ -55,6 +55,7 @@ func (p *ServerUpdater) Consume(seg *common.RfbSegment) error {
p.conn.SetPixelFormat(&serverInitMessage.PixelFormat)
case common.SegmentBytes:
logger.Debugf("WriteTo.Consume (ServerUpdater SegmentBytes): got bytes len=%d", len(seg.Bytes))
_, err := p.conn.Write(seg.Bytes)
if err != nil {
logger.Errorf("WriteTo.Consume (ServerUpdater SegmentBytes): problem writing to port: %s", err)

5
proxy/proxy_test.go
View File

@@ -6,8 +6,9 @@ func TestProxy(t *testing.T) {
//create default session if required
proxy := &VncProxy{
wsListeningUrl: "http://localhost:7777/", // empty = not listening on ws
recordingDir: "/Users/amitbet/vncRec", // empty = no recording
wsListeningUrl: "http://localhost:7777/", // empty = not listening on ws
recordingDir: "/Users/amitbet/vncRec", // empty = no recording
tcpListeningUrl: ":5904",
//recordingDir: "C:\\vncRec", // empty = no recording
targetServersPassword: "Ch_#!T@8", //empty = no auth
SingleSession: &VncSession{

1
tee-listeners/recorder.go
View File

@@ -151,6 +151,7 @@ func (r *Recorder) HandleRfbSegment(data *common.RfbSegment) error {
logger.Debugf("Recorder.HandleRfbSegment: writing rect")
//r.writeToDisk()
case common.SegmentBytes:
logger.Debug("Recorder.HandleRfbSegment: writing bytes, len:", len(data.Bytes))
if r.buffer.Len()+len(data.Bytes) > r.maxWriteSize-4 {
r.writeToDisk()
}