summaryrefslogtreecommitdiff
path: root/master/src/main
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-13 10:18:02 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-13 10:18:02 +0100
commitba7132f3ce5629cff2cc4857fff7bd672511bee8 (patch)
treedc6f7d1adafb8351004f2de6f3f775ebfe596fc7 /master/src/main
parent85a93de08694f25bd049c5236f11f06b8d8e4ff7 (diff)
Rename projects.
– jsonrpc → same – master → same-android
Diffstat (limited to 'master/src/main')
-rw-r--r--master/src/main/java/com/orbekk/Broadcast.java56
-rw-r--r--master/src/main/java/com/orbekk/HelloAndroidActivity.java49
-rw-r--r--master/src/main/java/com/orbekk/PingServer.java51
3 files changed, 0 insertions, 156 deletions
diff --git a/master/src/main/java/com/orbekk/Broadcast.java b/master/src/main/java/com/orbekk/Broadcast.java
deleted file mode 100644
index 84b2d6e..0000000
--- a/master/src/main/java/com/orbekk/Broadcast.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.orbekk;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import android.content.Context;
-import android.net.DhcpInfo;
-import android.net.wifi.WifiManager;
-
-public class Broadcast {
- private Context context;
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- public Broadcast(Context context) {
- this.context = context;
- }
-
- public InetAddress getBroadcastAddress() {
- WifiManager wifi = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);
- DhcpInfo dhcp = wifi.getDhcpInfo();
-
- int broadcast = (dhcp.ipAddress & dhcp.netmask) | ~dhcp.netmask;
- byte[] quads = new byte[4];
- for (int k = 0; k < 4; k++)
- quads[k] = (byte) ((broadcast >> k * 8) & 0xFF);
- try {
- return InetAddress.getByAddress(quads);
- } catch (UnknownHostException e) {
- logger.warn("Failed to find broadcast address.");
- return null;
- }
- }
-
- public boolean sendBroadcast(byte[] data, int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port);
- socket.setBroadcast(true);
- DatagramPacket packet = new DatagramPacket(data, data.length, getBroadcastAddress(), port);
- socket.send(packet);
- return true;
- } catch (SocketException e) {
- logger.warn("Failed to send broadcast.", e.fillInStackTrace());
- return false;
- } catch (IOException e) {
- logger.warn("Error when sending broadcast.", e.fillInStackTrace());
- return false;
- }
- }
-} \ No newline at end of file
diff --git a/master/src/main/java/com/orbekk/HelloAndroidActivity.java b/master/src/main/java/com/orbekk/HelloAndroidActivity.java
deleted file mode 100644
index 4160bf4..0000000
--- a/master/src/main/java/com/orbekk/HelloAndroidActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orbekk;
-
-import com.orbekk.net.Broadcaster;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-
-public class HelloAndroidActivity extends Activity {
-
- private static String TAG = "master";
- private PingServer pingServer;
-
- /**
- * Called when the activity is first created.
- * @param savedInstanceState If the activity is being re-initialized after
- * previously being shut down then this Bundle contains the data it most
- * recently supplied in onSaveInstanceState(Bundle). <b>Note: Otherwise it is null.</b>
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- System.setProperty("java.net.preferIPv4Stack", "true");
- System.setProperty("java.net.preferIPv6Addresses", "false");
-
- Log.i(TAG, "onCreate");
- setContentView(R.layout.main);
-
- pingServer = PingServer.createPingServer(10080);
- try {
- pingServer.start();
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
-
-// Broadcast broadcast = new Broadcast(this);
-// broadcast.sendBroadcast("Broadcast test".getBytes(), 10010);
- Broadcaster broadcaster = new Broadcaster();
- Log.i(TAG, "Broadcast success: " + broadcaster.sendBroadcast(10010, "Broadcast test from Android".getBytes()));
- }
-
- @Override
- protected void onDestroy() {
- pingServer.stop();
- super.onDestroy();
- }
-}
-
diff --git a/master/src/main/java/com/orbekk/PingServer.java b/master/src/main/java/com/orbekk/PingServer.java
deleted file mode 100644
index 5df2346..0000000
--- a/master/src/main/java/com/orbekk/PingServer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.orbekk;
-
-import org.eclipse.jetty.server.Server;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.googlecode.jsonrpc4j.JsonRpcServer;
-import com.orbekk.rpc.PingService;
-import com.orbekk.rpc.PingServiceImpl;
-import com.orbekk.rpc.RpcHandler;
-
-public class PingServer {
- private Server server;
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- public PingServer(Server server) {
- this.server = server;
- }
-
- public static PingServer createPingServer(int port) {
- PingService service = new PingServiceImpl();
- JsonRpcServer jsonServer = new JsonRpcServer(service, PingService.class);
-
- Server server = new Server(port);
- RpcHandler rpcHandler = new RpcHandler(jsonServer);
- server.setHandler(rpcHandler);
-
- return new PingServer(server);
- }
-
- public void start() throws Exception {
- logger.info("Starting server.");
- server.start();
- }
-
- public void join() {
- try {
- server.join();
- } catch (InterruptedException e) {
- logger.info("Received InterruptException while waiting for server.", e.fillInStackTrace());
- }
- }
-
- public void stop() {
- try {
- server.stop();
- } catch (Exception e) {
- logger.warn("Exception when stopping server.", e.fillInStackTrace());
- }
- }
-}