From 0827ec0c3b63e314aed4641fa65bc11b66f169b5 Mon Sep 17 00:00:00 2001 From: MaximZaitsev Date: Mon, 22 Aug 2016 11:38:06 +0300 Subject: [PATCH] add back connect.proto file (remove mistakenly) --- proto/protofiles_sources/server_car/connect.proto | 12 ++++++++++++ server/src/main/java/ServerMain.kt | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 proto/protofiles_sources/server_car/connect.proto diff --git a/proto/protofiles_sources/server_car/connect.proto b/proto/protofiles_sources/server_car/connect.proto new file mode 100644 index 00000000000..20296059ba5 --- /dev/null +++ b/proto/protofiles_sources/server_car/connect.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +package carkot; + +message ConnectionRequest { + repeated int32 ipValues = 1; + int32 port = 2; +} + +message ConnectionResponse { + int32 uid = 1; + int32 code = 2; +} diff --git a/server/src/main/java/ServerMain.kt b/server/src/main/java/ServerMain.kt index 0e0548d3bcb..26c3171b433 100644 --- a/server/src/main/java/ServerMain.kt +++ b/server/src/main/java/ServerMain.kt @@ -1,19 +1,8 @@ -import Exceptions.InactiveCarException -import car.client.Client import io.netty.bootstrap.ServerBootstrap -import io.netty.buffer.Unpooled import io.netty.channel.nio.NioEventLoopGroup import io.netty.channel.socket.nio.NioServerSocketChannel -import io.netty.handler.codec.http.* -import objects.Car -import java.io.ByteArrayOutputStream -import java.util.* import kotlin.concurrent.thread -/** - * Created by user on 7/6/16. - */ - val timeDeltaToDrop = 600000//time in ms. if car is inactive more than this time, server drop session with car val carServerPort: Int = 7925 val webServerPort: Int = 7926