From c048537232bbf4f37323bdd61bf067e853b5b05b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 4 Sep 2010 22:55:10 -0700 Subject: [PATCH] Added dummy proxy implementation, moved client, added main Makefile. --- guacamole/Makefile | 15 +++ guacamole/client/Makefile | 11 ++ guacamole/{ => client}/ant/build.properties | 0 guacamole/{ => client}/build.xml | 0 .../doc/example/guacamole-users.xml | 0 .../{ => client}/doc/example/guacamole.xml | 0 .../src/net/sourceforge/guacamole/Client.java | 0 .../guacamole/GuacamoleException.java | 0 .../sourceforge/guacamole/event/Event.java | 0 .../guacamole/event/EventHandler.java | 0 .../guacamole/event/EventQueue.java | 0 .../sourceforge/guacamole/event/KeyEvent.java | 0 .../guacamole/event/PointerEvent.java | 0 .../instruction/ClipboardInstruction.java | 0 .../instruction/ErrorInstruction.java | 0 .../guacamole/instruction/Instruction.java | 0 .../instruction/NameInstruction.java | 0 .../instruction/SizeInstruction.java | 0 .../framebuffer/CopyRectInstruction.java | 0 .../framebuffer/CursorInstruction.java | 0 .../framebuffer/DrawRectInstruction.java | 0 .../instruction/framebuffer/PNGImage.java | 0 .../framebuffer/PNGInstruction.java | 0 .../net/sourceforge/guacamole/net/Base64.java | 0 .../guacamole/net/Configuration.java | 0 .../guacamole/net/GuacamoleConfiguration.java | 0 .../guacamole/net/GuacamoleServlet.java | 0 .../guacamole/net/GuacamoleSession.java | 0 .../guacamole/net/XMLGuacamoleServlet.java | 0 .../guacamole/net/control/Connect.java | 0 .../guacamole/net/control/Disconnect.java | 0 .../guacamole/net/input/Clipboard.java | 0 .../sourceforge/guacamole/net/input/Key.java | 0 .../guacamole/net/input/Pointer.java | 0 .../net/output/InstructionStream.java | 0 .../guacamole/vnc/InputOutputStream.java | 0 .../sourceforge/guacamole/vnc/VNCClient.java | 0 .../guacamole/vnc/VNCConfiguration.java | 0 .../guacamole/vnc/VNCException.java | 0 .../vnc/VNCFullColorImageReader.java | 0 .../guacamole/vnc/VNCImageReader.java | 0 .../guacamole/vnc/VNCIndexedImageReader.java | 0 guacamole/{ => client}/web/WEB-INF/web.xml | 0 .../{ => client}/web/agpl-3.0-standalone.html | 0 guacamole/{ => client}/web/guacamole.css | 0 .../{ => client}/web/images/agpl-logo.png | Bin guacamole/{ => client}/web/images/checker.png | Bin .../web/images/guacamole-64-icon.png | Bin .../web/images/guacamole-icon-64.png | Bin .../web/images/guacamole-logo.png | Bin .../{ => client}/web/images/mouse/blank.cur | Bin .../{ => client}/web/images/mouse/blank.gif | Bin .../{ => client}/web/images/mouse/dot.gif | Bin .../web/images/noguacamole-logo.png | Bin .../{ => client}/web/images/noimage92.png | Bin .../{ => client}/web/images/spinner92.gif | Bin guacamole/{ => client}/web/index.html | 0 .../{ => client}/web/javascript/guacamole.js | 0 .../{ => client}/web/javascript/keyboard.js | 0 .../{ => client}/web/javascript/keymap.js | 0 .../{ => client}/web/javascript/layer.js | 0 .../{ => client}/web/javascript/message.js | 0 .../{ => client}/web/javascript/mouse.js | 0 .../{ => client}/web/javascript/oskeyboard.js | 0 guacamole/{ => client}/web/keyboard.css | 0 .../{ => client}/web/layouts/en-us-qwerty.xml | 0 guacamole/proxy/Makefile | 20 ++++ guacamole/proxy/daemon.c | 96 ++++++++++++++++++ guacamole/proxy/proxy.c | 11 ++ guacamole/proxy/proxy.h | 6 ++ 70 files changed, 159 insertions(+) create mode 100644 guacamole/Makefile create mode 100644 guacamole/client/Makefile rename guacamole/{ => client}/ant/build.properties (100%) rename guacamole/{ => client}/build.xml (100%) rename guacamole/{ => client}/doc/example/guacamole-users.xml (100%) rename guacamole/{ => client}/doc/example/guacamole.xml (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/Client.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/GuacamoleException.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/event/Event.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/event/EventHandler.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/event/EventQueue.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/event/KeyEvent.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/event/PointerEvent.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/ClipboardInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/ErrorInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/Instruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/NameInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/SizeInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/framebuffer/CopyRectInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/framebuffer/CursorInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/framebuffer/DrawRectInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/framebuffer/PNGImage.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/instruction/framebuffer/PNGInstruction.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/Base64.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/Configuration.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/GuacamoleServlet.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/GuacamoleSession.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/control/Connect.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/control/Disconnect.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/input/Clipboard.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/input/Key.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/input/Pointer.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/net/output/InstructionStream.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/InputOutputStream.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCClient.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCConfiguration.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCException.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCFullColorImageReader.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCImageReader.java (100%) rename guacamole/{ => client}/src/net/sourceforge/guacamole/vnc/VNCIndexedImageReader.java (100%) rename guacamole/{ => client}/web/WEB-INF/web.xml (100%) rename guacamole/{ => client}/web/agpl-3.0-standalone.html (100%) rename guacamole/{ => client}/web/guacamole.css (100%) rename guacamole/{ => client}/web/images/agpl-logo.png (100%) rename guacamole/{ => client}/web/images/checker.png (100%) rename guacamole/{ => client}/web/images/guacamole-64-icon.png (100%) rename guacamole/{ => client}/web/images/guacamole-icon-64.png (100%) rename guacamole/{ => client}/web/images/guacamole-logo.png (100%) rename guacamole/{ => client}/web/images/mouse/blank.cur (100%) rename guacamole/{ => client}/web/images/mouse/blank.gif (100%) rename guacamole/{ => client}/web/images/mouse/dot.gif (100%) rename guacamole/{ => client}/web/images/noguacamole-logo.png (100%) rename guacamole/{ => client}/web/images/noimage92.png (100%) rename guacamole/{ => client}/web/images/spinner92.gif (100%) rename guacamole/{ => client}/web/index.html (100%) rename guacamole/{ => client}/web/javascript/guacamole.js (100%) rename guacamole/{ => client}/web/javascript/keyboard.js (100%) rename guacamole/{ => client}/web/javascript/keymap.js (100%) rename guacamole/{ => client}/web/javascript/layer.js (100%) rename guacamole/{ => client}/web/javascript/message.js (100%) rename guacamole/{ => client}/web/javascript/mouse.js (100%) rename guacamole/{ => client}/web/javascript/oskeyboard.js (100%) rename guacamole/{ => client}/web/keyboard.css (100%) rename guacamole/{ => client}/web/layouts/en-us-qwerty.xml (100%) create mode 100644 guacamole/proxy/Makefile create mode 100644 guacamole/proxy/daemon.c create mode 100644 guacamole/proxy/proxy.c create mode 100644 guacamole/proxy/proxy.h diff --git a/guacamole/Makefile b/guacamole/Makefile new file mode 100644 index 000000000..62b2883fd --- /dev/null +++ b/guacamole/Makefile @@ -0,0 +1,15 @@ + +.PHONY: client proxy clean + +all: client proxy + +client: + $(MAKE) -C client all + +proxy: + $(MAKE) -C proxy all + +clean: + $(MAKE) -C client clean + $(MAKE) -C proxy clean + diff --git a/guacamole/client/Makefile b/guacamole/client/Makefile new file mode 100644 index 000000000..760266a47 --- /dev/null +++ b/guacamole/client/Makefile @@ -0,0 +1,11 @@ + +.PHONY: client clean + +all: client + +client: + ant war + +clean: + ant clean + diff --git a/guacamole/ant/build.properties b/guacamole/client/ant/build.properties similarity index 100% rename from guacamole/ant/build.properties rename to guacamole/client/ant/build.properties diff --git a/guacamole/build.xml b/guacamole/client/build.xml similarity index 100% rename from guacamole/build.xml rename to guacamole/client/build.xml diff --git a/guacamole/doc/example/guacamole-users.xml b/guacamole/client/doc/example/guacamole-users.xml similarity index 100% rename from guacamole/doc/example/guacamole-users.xml rename to guacamole/client/doc/example/guacamole-users.xml diff --git a/guacamole/doc/example/guacamole.xml b/guacamole/client/doc/example/guacamole.xml similarity index 100% rename from guacamole/doc/example/guacamole.xml rename to guacamole/client/doc/example/guacamole.xml diff --git a/guacamole/src/net/sourceforge/guacamole/Client.java b/guacamole/client/src/net/sourceforge/guacamole/Client.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/Client.java rename to guacamole/client/src/net/sourceforge/guacamole/Client.java diff --git a/guacamole/src/net/sourceforge/guacamole/GuacamoleException.java b/guacamole/client/src/net/sourceforge/guacamole/GuacamoleException.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/GuacamoleException.java rename to guacamole/client/src/net/sourceforge/guacamole/GuacamoleException.java diff --git a/guacamole/src/net/sourceforge/guacamole/event/Event.java b/guacamole/client/src/net/sourceforge/guacamole/event/Event.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/event/Event.java rename to guacamole/client/src/net/sourceforge/guacamole/event/Event.java diff --git a/guacamole/src/net/sourceforge/guacamole/event/EventHandler.java b/guacamole/client/src/net/sourceforge/guacamole/event/EventHandler.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/event/EventHandler.java rename to guacamole/client/src/net/sourceforge/guacamole/event/EventHandler.java diff --git a/guacamole/src/net/sourceforge/guacamole/event/EventQueue.java b/guacamole/client/src/net/sourceforge/guacamole/event/EventQueue.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/event/EventQueue.java rename to guacamole/client/src/net/sourceforge/guacamole/event/EventQueue.java diff --git a/guacamole/src/net/sourceforge/guacamole/event/KeyEvent.java b/guacamole/client/src/net/sourceforge/guacamole/event/KeyEvent.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/event/KeyEvent.java rename to guacamole/client/src/net/sourceforge/guacamole/event/KeyEvent.java diff --git a/guacamole/src/net/sourceforge/guacamole/event/PointerEvent.java b/guacamole/client/src/net/sourceforge/guacamole/event/PointerEvent.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/event/PointerEvent.java rename to guacamole/client/src/net/sourceforge/guacamole/event/PointerEvent.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/ClipboardInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/ClipboardInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/ClipboardInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/ClipboardInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/ErrorInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/ErrorInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/ErrorInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/ErrorInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/Instruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/Instruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/Instruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/Instruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/NameInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/NameInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/NameInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/NameInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/SizeInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/SizeInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/SizeInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/SizeInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/CopyRectInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/CopyRectInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/CopyRectInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/CopyRectInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/CursorInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/CursorInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/CursorInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/CursorInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/DrawRectInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/DrawRectInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/DrawRectInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/DrawRectInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/PNGImage.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/PNGImage.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/PNGImage.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/PNGImage.java diff --git a/guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/PNGInstruction.java b/guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/PNGInstruction.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/instruction/framebuffer/PNGInstruction.java rename to guacamole/client/src/net/sourceforge/guacamole/instruction/framebuffer/PNGInstruction.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/Base64.java b/guacamole/client/src/net/sourceforge/guacamole/net/Base64.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/Base64.java rename to guacamole/client/src/net/sourceforge/guacamole/net/Base64.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/Configuration.java b/guacamole/client/src/net/sourceforge/guacamole/net/Configuration.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/Configuration.java rename to guacamole/client/src/net/sourceforge/guacamole/net/Configuration.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java rename to guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/GuacamoleServlet.java b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/GuacamoleServlet.java rename to guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/GuacamoleSession.java rename to guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java b/guacamole/client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java rename to guacamole/client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/control/Connect.java b/guacamole/client/src/net/sourceforge/guacamole/net/control/Connect.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/control/Connect.java rename to guacamole/client/src/net/sourceforge/guacamole/net/control/Connect.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/control/Disconnect.java b/guacamole/client/src/net/sourceforge/guacamole/net/control/Disconnect.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/control/Disconnect.java rename to guacamole/client/src/net/sourceforge/guacamole/net/control/Disconnect.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/input/Clipboard.java b/guacamole/client/src/net/sourceforge/guacamole/net/input/Clipboard.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/input/Clipboard.java rename to guacamole/client/src/net/sourceforge/guacamole/net/input/Clipboard.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/input/Key.java b/guacamole/client/src/net/sourceforge/guacamole/net/input/Key.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/input/Key.java rename to guacamole/client/src/net/sourceforge/guacamole/net/input/Key.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/input/Pointer.java b/guacamole/client/src/net/sourceforge/guacamole/net/input/Pointer.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/input/Pointer.java rename to guacamole/client/src/net/sourceforge/guacamole/net/input/Pointer.java diff --git a/guacamole/src/net/sourceforge/guacamole/net/output/InstructionStream.java b/guacamole/client/src/net/sourceforge/guacamole/net/output/InstructionStream.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/net/output/InstructionStream.java rename to guacamole/client/src/net/sourceforge/guacamole/net/output/InstructionStream.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/InputOutputStream.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/InputOutputStream.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/InputOutputStream.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/InputOutputStream.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCClient.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCClient.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCClient.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCClient.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCConfiguration.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCConfiguration.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCConfiguration.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCConfiguration.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCException.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCException.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCException.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCException.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCFullColorImageReader.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCFullColorImageReader.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCFullColorImageReader.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCFullColorImageReader.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCImageReader.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCImageReader.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCImageReader.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCImageReader.java diff --git a/guacamole/src/net/sourceforge/guacamole/vnc/VNCIndexedImageReader.java b/guacamole/client/src/net/sourceforge/guacamole/vnc/VNCIndexedImageReader.java similarity index 100% rename from guacamole/src/net/sourceforge/guacamole/vnc/VNCIndexedImageReader.java rename to guacamole/client/src/net/sourceforge/guacamole/vnc/VNCIndexedImageReader.java diff --git a/guacamole/web/WEB-INF/web.xml b/guacamole/client/web/WEB-INF/web.xml similarity index 100% rename from guacamole/web/WEB-INF/web.xml rename to guacamole/client/web/WEB-INF/web.xml diff --git a/guacamole/web/agpl-3.0-standalone.html b/guacamole/client/web/agpl-3.0-standalone.html similarity index 100% rename from guacamole/web/agpl-3.0-standalone.html rename to guacamole/client/web/agpl-3.0-standalone.html diff --git a/guacamole/web/guacamole.css b/guacamole/client/web/guacamole.css similarity index 100% rename from guacamole/web/guacamole.css rename to guacamole/client/web/guacamole.css diff --git a/guacamole/web/images/agpl-logo.png b/guacamole/client/web/images/agpl-logo.png similarity index 100% rename from guacamole/web/images/agpl-logo.png rename to guacamole/client/web/images/agpl-logo.png diff --git a/guacamole/web/images/checker.png b/guacamole/client/web/images/checker.png similarity index 100% rename from guacamole/web/images/checker.png rename to guacamole/client/web/images/checker.png diff --git a/guacamole/web/images/guacamole-64-icon.png b/guacamole/client/web/images/guacamole-64-icon.png similarity index 100% rename from guacamole/web/images/guacamole-64-icon.png rename to guacamole/client/web/images/guacamole-64-icon.png diff --git a/guacamole/web/images/guacamole-icon-64.png b/guacamole/client/web/images/guacamole-icon-64.png similarity index 100% rename from guacamole/web/images/guacamole-icon-64.png rename to guacamole/client/web/images/guacamole-icon-64.png diff --git a/guacamole/web/images/guacamole-logo.png b/guacamole/client/web/images/guacamole-logo.png similarity index 100% rename from guacamole/web/images/guacamole-logo.png rename to guacamole/client/web/images/guacamole-logo.png diff --git a/guacamole/web/images/mouse/blank.cur b/guacamole/client/web/images/mouse/blank.cur similarity index 100% rename from guacamole/web/images/mouse/blank.cur rename to guacamole/client/web/images/mouse/blank.cur diff --git a/guacamole/web/images/mouse/blank.gif b/guacamole/client/web/images/mouse/blank.gif similarity index 100% rename from guacamole/web/images/mouse/blank.gif rename to guacamole/client/web/images/mouse/blank.gif diff --git a/guacamole/web/images/mouse/dot.gif b/guacamole/client/web/images/mouse/dot.gif similarity index 100% rename from guacamole/web/images/mouse/dot.gif rename to guacamole/client/web/images/mouse/dot.gif diff --git a/guacamole/web/images/noguacamole-logo.png b/guacamole/client/web/images/noguacamole-logo.png similarity index 100% rename from guacamole/web/images/noguacamole-logo.png rename to guacamole/client/web/images/noguacamole-logo.png diff --git a/guacamole/web/images/noimage92.png b/guacamole/client/web/images/noimage92.png similarity index 100% rename from guacamole/web/images/noimage92.png rename to guacamole/client/web/images/noimage92.png diff --git a/guacamole/web/images/spinner92.gif b/guacamole/client/web/images/spinner92.gif similarity index 100% rename from guacamole/web/images/spinner92.gif rename to guacamole/client/web/images/spinner92.gif diff --git a/guacamole/web/index.html b/guacamole/client/web/index.html similarity index 100% rename from guacamole/web/index.html rename to guacamole/client/web/index.html diff --git a/guacamole/web/javascript/guacamole.js b/guacamole/client/web/javascript/guacamole.js similarity index 100% rename from guacamole/web/javascript/guacamole.js rename to guacamole/client/web/javascript/guacamole.js diff --git a/guacamole/web/javascript/keyboard.js b/guacamole/client/web/javascript/keyboard.js similarity index 100% rename from guacamole/web/javascript/keyboard.js rename to guacamole/client/web/javascript/keyboard.js diff --git a/guacamole/web/javascript/keymap.js b/guacamole/client/web/javascript/keymap.js similarity index 100% rename from guacamole/web/javascript/keymap.js rename to guacamole/client/web/javascript/keymap.js diff --git a/guacamole/web/javascript/layer.js b/guacamole/client/web/javascript/layer.js similarity index 100% rename from guacamole/web/javascript/layer.js rename to guacamole/client/web/javascript/layer.js diff --git a/guacamole/web/javascript/message.js b/guacamole/client/web/javascript/message.js similarity index 100% rename from guacamole/web/javascript/message.js rename to guacamole/client/web/javascript/message.js diff --git a/guacamole/web/javascript/mouse.js b/guacamole/client/web/javascript/mouse.js similarity index 100% rename from guacamole/web/javascript/mouse.js rename to guacamole/client/web/javascript/mouse.js diff --git a/guacamole/web/javascript/oskeyboard.js b/guacamole/client/web/javascript/oskeyboard.js similarity index 100% rename from guacamole/web/javascript/oskeyboard.js rename to guacamole/client/web/javascript/oskeyboard.js diff --git a/guacamole/web/keyboard.css b/guacamole/client/web/keyboard.css similarity index 100% rename from guacamole/web/keyboard.css rename to guacamole/client/web/keyboard.css diff --git a/guacamole/web/layouts/en-us-qwerty.xml b/guacamole/client/web/layouts/en-us-qwerty.xml similarity index 100% rename from guacamole/web/layouts/en-us-qwerty.xml rename to guacamole/client/web/layouts/en-us-qwerty.xml diff --git a/guacamole/proxy/Makefile b/guacamole/proxy/Makefile new file mode 100644 index 000000000..715012488 --- /dev/null +++ b/guacamole/proxy/Makefile @@ -0,0 +1,20 @@ + +.PHONY: clean + +all: guacd + +guacd: daemon.o proxy.o + $(CC) daemon.o proxy.o -o guacd + +proxy.o: proxy.c proxy.h + $(CC) -c -ansi -pedantic proxy.c + +daemon.o: daemon.c proxy.h + $(CC) -c -ansi -pedantic daemon.c + +clean: + $(RM) *.o guacd + +distclean: clean + $(RM) *~ + diff --git a/guacamole/proxy/daemon.c b/guacamole/proxy/daemon.c new file mode 100644 index 000000000..48773cecd --- /dev/null +++ b/guacamole/proxy/daemon.c @@ -0,0 +1,96 @@ + +#include +#include +#include +#include +#include +#include + +#include "proxy.h" + +int main(int argc, char* argv[]) { + + /* Server */ + int socket_fd; + struct sockaddr_in server_addr; + + /* Client */ + struct sockaddr_in client_addr; + unsigned int client_addr_len; + int connected_socket_fd; + pid_t proxy_pid ; + + /* Get binding address */ + memset(&server_addr, 0, sizeof(server_addr)); /* Zero struct */ + server_addr.sin_family = AF_INET; + server_addr.sin_addr.s_addr = INADDR_ANY; + server_addr.sin_port = htons(1234); + + /* Get socket */ + socket_fd = socket(AF_INET, SOCK_STREAM, 0); + if (socket_fd < 0) { + perror("Error opening socket"); + return 1; + } + + /* Bind socket to address */ + if (bind(socket_fd, (struct sockaddr*) &server_addr, + sizeof(server_addr)) < 0) { + perror("Error binding socket"); + return 2; + } + + /* Daemon loop */ + for (;;) { + + fprintf(stderr, "Listening...\n"); + + /* Listen for connections */ + if (listen(socket_fd, 5) < 0) { + perror("Error listening on socket"); + return 3; + } + + /* Accept connection */ + client_addr_len = sizeof(client_addr); + connected_socket_fd = accept(socket_fd, (struct sockaddr*) &client_addr, &client_addr_len); + if (connected_socket_fd < 0) { + perror("Error accepting client"); + return 3; + } + + /* Fork proxy */ + proxy_pid = fork(); + if (proxy_pid < 0) { + perror("Could not fork child"); + } + + /* In child ... */ + else if (proxy_pid == 0) { + proxy(connected_socket_fd); + + /* Close socket */ + if (close(connected_socket_fd) < 0) { + perror("Error closing connection"); + return 3; + } + + fprintf(stderr, "Child exiting.\n"); + return 0; + } + + else + fprintf(stderr, "Child forked.\n"); + + } + + /* Close socket */ + if (close(socket_fd) < 0) { + perror("Error closing socket"); + return 3; + } + + return 0; + +} + diff --git a/guacamole/proxy/proxy.c b/guacamole/proxy/proxy.c new file mode 100644 index 000000000..2770bb43a --- /dev/null +++ b/guacamole/proxy/proxy.c @@ -0,0 +1,11 @@ + +#include + +#include "proxy.h" + +void proxy(int client_fd) { + + write(client_fd, "name:hello;size:1024,768;error:Test finished.;", 46); + +} + diff --git a/guacamole/proxy/proxy.h b/guacamole/proxy/proxy.h new file mode 100644 index 000000000..0e434bc0e --- /dev/null +++ b/guacamole/proxy/proxy.h @@ -0,0 +1,6 @@ +#ifndef _PROXY_H_ +#define _PROXY_H + +void proxy(int client_fd); + +#endif