From 599a7f77c1849f4dce1cf019df51aa83858529c2 Mon Sep 17 00:00:00 2001 From: MaximZaitsev Date: Mon, 11 Jul 2016 13:46:42 +0300 Subject: [PATCH] renamed dev loader folder --- {devloader => car_net}/data/fw/fancyblink.bin | Bin {devloader => car_net}/data/fw/fancyblink.elf | Bin {devloader => car_net}/data/fw/stm32f4-stock.bin | Bin {devloader => car_net}/data/gdb.cmds | 0 {devloader => car_net}/data/linux-arm/st-flash | Bin {devloader => car_net}/data/linux-arm/st-util | Bin {devloader => car_net}/data/macosx-x86_64/st-flash | Bin {devloader => car_net}/data/macosx-x86_64/st-util | Bin {devloader => car_net}/devloader.py | 0 {devloader => car_net}/proxy.js | 0 {devloader => car_net}/stm32.sh | 0 server/src/car/client/Client.kt | 11 +++++++++-- server/src/car/server/Handler.kt | 2 ++ server/src/web/server/Initializer.kt | 1 - 14 files changed, 11 insertions(+), 3 deletions(-) rename {devloader => car_net}/data/fw/fancyblink.bin (100%) rename {devloader => car_net}/data/fw/fancyblink.elf (100%) rename {devloader => car_net}/data/fw/stm32f4-stock.bin (100%) rename {devloader => car_net}/data/gdb.cmds (100%) rename {devloader => car_net}/data/linux-arm/st-flash (100%) rename {devloader => car_net}/data/linux-arm/st-util (100%) rename {devloader => car_net}/data/macosx-x86_64/st-flash (100%) rename {devloader => car_net}/data/macosx-x86_64/st-util (100%) rename {devloader => car_net}/devloader.py (100%) rename {devloader => car_net}/proxy.js (100%) rename {devloader => car_net}/stm32.sh (100%) diff --git a/devloader/data/fw/fancyblink.bin b/car_net/data/fw/fancyblink.bin similarity index 100% rename from devloader/data/fw/fancyblink.bin rename to car_net/data/fw/fancyblink.bin diff --git a/devloader/data/fw/fancyblink.elf b/car_net/data/fw/fancyblink.elf similarity index 100% rename from devloader/data/fw/fancyblink.elf rename to car_net/data/fw/fancyblink.elf diff --git a/devloader/data/fw/stm32f4-stock.bin b/car_net/data/fw/stm32f4-stock.bin similarity index 100% rename from devloader/data/fw/stm32f4-stock.bin rename to car_net/data/fw/stm32f4-stock.bin diff --git a/devloader/data/gdb.cmds b/car_net/data/gdb.cmds similarity index 100% rename from devloader/data/gdb.cmds rename to car_net/data/gdb.cmds diff --git a/devloader/data/linux-arm/st-flash b/car_net/data/linux-arm/st-flash similarity index 100% rename from devloader/data/linux-arm/st-flash rename to car_net/data/linux-arm/st-flash diff --git a/devloader/data/linux-arm/st-util b/car_net/data/linux-arm/st-util similarity index 100% rename from devloader/data/linux-arm/st-util rename to car_net/data/linux-arm/st-util diff --git a/devloader/data/macosx-x86_64/st-flash b/car_net/data/macosx-x86_64/st-flash similarity index 100% rename from devloader/data/macosx-x86_64/st-flash rename to car_net/data/macosx-x86_64/st-flash diff --git a/devloader/data/macosx-x86_64/st-util b/car_net/data/macosx-x86_64/st-util similarity index 100% rename from devloader/data/macosx-x86_64/st-util rename to car_net/data/macosx-x86_64/st-util diff --git a/devloader/devloader.py b/car_net/devloader.py similarity index 100% rename from devloader/devloader.py rename to car_net/devloader.py diff --git a/devloader/proxy.js b/car_net/proxy.js similarity index 100% rename from devloader/proxy.js rename to car_net/proxy.js diff --git a/devloader/stm32.sh b/car_net/stm32.sh similarity index 100% rename from devloader/stm32.sh rename to car_net/stm32.sh diff --git a/server/src/car/client/Client.kt b/server/src/car/client/Client.kt index 3ab9a35f1e0..acc60f5e6e0 100644 --- a/server/src/car/client/Client.kt +++ b/server/src/car/client/Client.kt @@ -5,6 +5,8 @@ import io.netty.channel.nio.NioEventLoopGroup import io.netty.channel.socket.nio.NioSocketChannel import io.netty.handler.codec.http.HttpRequest import io.netty.util.AttributeKey +import objects.Environment +import java.net.ConnectException /** * Created by user on 7/8/16. @@ -14,8 +16,8 @@ object Client { val bootstrap: Bootstrap = makeBootstrap() private fun makeBootstrap(): Bootstrap { - val group = NioEventLoopGroup(); - val b = Bootstrap(); + val group = NioEventLoopGroup() + val b = Bootstrap() b.group(group).channel(NioSocketChannel().javaClass).handler(ClientInitializer()) .attr(AttributeKey.newInstance("url"), "") .attr(AttributeKey.newInstance("uid"), 0) @@ -31,6 +33,11 @@ object Client { ch.closeFuture().sync()//wait for answer } catch (e: InterruptedException) { + } catch (e: ConnectException) { + val carMap = Environment.instance.map + synchronized(carMap, { + carMap.remove(carUid) + }) } } diff --git a/server/src/car/server/Handler.kt b/server/src/car/server/Handler.kt index f935927579d..172dc4c7b0e 100644 --- a/server/src/car/server/Handler.kt +++ b/server/src/car/server/Handler.kt @@ -40,6 +40,7 @@ class Handler : SimpleChannelInboundHandler() { val uid = environment.connectCar(data.ip, data.port) answer = ConnectP.ConnectionResponse.newBuilder().setUid(uid).build().toByteArray() } + //todo return connection error } routeDoneUrl -> { var data: RouteDone? = null @@ -58,6 +59,7 @@ class Handler : SimpleChannelInboundHandler() { success = false } }) + //todo return connection error } } else -> { diff --git a/server/src/web/server/Initializer.kt b/server/src/web/server/Initializer.kt index 1c84c820bf8..58f35fac868 100644 --- a/server/src/web/server/Initializer.kt +++ b/server/src/web/server/Initializer.kt @@ -22,7 +22,6 @@ class Initializer : ChannelInitializer { override fun initChannel(channel: SocketChannel) { val p: ChannelPipeline = channel.pipeline() - p.addLast(HttpServerCodec()) p.addLast(group, Handler()) }