Skip to content

GitLab

Commit 1feeb8ca authored by Ruben Jesus Garcia Hernandez's avatar Ruben Jesus Garcia Hernandez
Browse files

Prototype proxy server; will form the basis of multiuser support

parent 419fea85
Hide whitespace changes
Inline Side-by-side
proxy/Makefile 0 → 100644
View file @ 1feeb8ca
proxy: proxy.cpp Makefile
g++ -g proxy.cpp -o proxy
clean:
rm -f proxy.o proxy
proxy/VS2012/proxy/proxy.sln 0 → 100644
View file @ 1feeb8ca

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "proxy", "proxy\proxy.vcxproj", "{73CB5C3E-8A4E-4817-9791-4C1799712610}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{73CB5C3E-8A4E-4817-9791-4C1799712610}.Debug|Win32.ActiveCfg = Debug|Win32
{73CB5C3E-8A4E-4817-9791-4C1799712610}.Debug|Win32.Build.0 = Debug|Win32
{73CB5C3E-8A4E-4817-9791-4C1799712610}.Release|Win32.ActiveCfg = Release|Win32
{73CB5C3E-8A4E-4817-9791-4C1799712610}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
proxy/VS2012/proxy/proxy/proxy.vcxproj 0 → 100644
View file @ 1feeb8ca
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{73CB5C3E-8A4E-4817-9791-4C1799712610}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>proxy</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\proxy.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
proxy/VS2012/proxy/proxy/proxy.vcxproj.filters 0 → 100644
View file @ 1feeb8ca
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Archivos de código fuente">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Archivos de encabezado">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Archivos de recursos">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\proxy.cpp">
<Filter>Archivos de código fuente</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
proxy/proxy.cpp 0 → 100644
View file @ 1feeb8ca
/*
# Copyright 2016-2018 Ruben Jesus Garcia-Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
*/
#include <stdio.h>
#include <stdint.h>
#ifdef WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#pragma comment(lib, "Ws2_32.lib")
#else
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/select.h>
//http://stackoverflow.com/questions/4291149/difference-between-string-h-and-strings-h
#endif
#include <string.h>
#include <stdlib.h>
#include <vector>
std::vector<int> sockfds;
void error(const char *msg)
{
perror(msg);
#ifdef WIN32
for (unsigned int i=0;i< sockfds.size();i++)
if (sockfds[i]>=0 && sockfds[i]!=INVALID_SOCKET)
closesocket (sockfds[i]);
#else
for (int i=0;i< sockfds.size();i++)
if (sockfds[i]>=0)
close (sockfds[i]);
#endif
#ifdef WIN32
WSACleanup();
#endif
exit(1);
}
struct state_t {
int32_t timestep;
int32_t iso;
bool showatoms;
int32_t ncfg;
} state;
bool initNewSocket (unsigned int secret)
{
int n;
int32_t tmp;
int32_t rsec;
char buffer[17];
buffer[0]='t';
tmp=htonl(state.timestep);
memcpy (buffer+1, &tmp, sizeof(state.timestep));
buffer[5]='i';
tmp=htonl(state.iso);
memcpy (buffer+6, &tmp, sizeof(state.iso));
buffer[10]='s';
buffer[11]=(char)true;
buffer[12]='n';
tmp=htonl(state.ncfg);
memcpy (buffer+13, &tmp, sizeof(state.iso));
//struct sockaddr_in cli_addr;
//socklen_t clilen;
sockfds.push_back(accept(sockfds[0], nullptr, nullptr));
#ifdef WIN32
if (sockfds.back() == INVALID_SOCKET)
#else
if (sockfds.back() < 0)
#endif
error("ERROR on accept");
tmp=htonl (secret);
n=recv(sockfds.back(), (char*)&rsec, sizeof(rsec), 0);
if (tmp!=rsec) {
#ifdef WIN32
closesocket (sockfds.back());
#else
close (sockfds.back());
#endif
return false;
}
n = send(sockfds.back(), buffer , 17, 0);
if (n < 0) {
error("ERROR writing to socket");
return false;
}
return true;
}
int main(int argc, char *argv[])
{
unsigned int secret;
//windows sockets are only very loosely based on unix sockets.
//initialization and error management are different.
//https://msdn.microsoft.com/en-us/library/windows/desktop/ms742213%28v=vs.85%29.aspx
//http://tangentsoft.net/wskfaq/articles/bsd-compatibility.html
state.timestep=0;
state.iso=-1; //ISOS
state.showatoms=true;
state.ncfg=1;
fd_set active_fd_set, read_fd_set;
int portno;
std::vector<socklen_t> clilens;
char buffer[256];
struct sockaddr_in serv_addr;
std::vector<struct sockaddr_in> cli_addrs;
int n;
#ifdef WIN32
WORD wVersionRequested;
WSADATA wsaData;
int err;
wVersionRequested = MAKEWORD(2, 2);
err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) {
/* Tell the user that we could not find a usable */
/* Winsock DLL. */
printf("WSAStartup failed with error: %d\n", err);
return 1;
}
if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
/* Tell the user that we could not find a usable */
/* WinSock DLL. */
printf("Could not find a usable version of Winsock.dll\n");
WSACleanup();
return 1;
}
#endif
if (argc < 3) {
fprintf(stderr,"Usage:\n%s <port> <secret>\nSecret is a 32 bit unsigned integer\n", argv[0]);
exit(1);
}
secret=atoi(argv[2]);
sockfds.push_back (socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
#ifdef WIN32
if (sockfds[0] == INVALID_SOCKET) {
printf("Error at socket(): %ld\n", WSAGetLastError());
#else
if (sockfds[0] < 0) {
#endif
error("ERROR opening socket");
}
memset((char *) &serv_addr, 0, sizeof(serv_addr));
cli_addrs.push_back(serv_addr);
cli_addrs.push_back(serv_addr);
portno = atoi(argv[1]);
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = INADDR_ANY;
serv_addr.sin_port = htons(portno);
if (bind(sockfds[0], (struct sockaddr *) &serv_addr,
sizeof(serv_addr)) < 0)
error("ERROR on binding");
listen(sockfds[0],5);
clilens.push_back(sizeof(struct sockaddr_in));
clilens.push_back(sizeof(struct sockaddr_in));
FD_ZERO (&active_fd_set);
FD_SET (sockfds[0], &active_fd_set);
memset(buffer,0, 256);
for (;;) {
read_fd_set=active_fd_set;
#ifdef WIN32
if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) == INVALID_SOCKET)
#else
if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0)
#endif
{
error ("select");
}
for (unsigned i=1;i<sockfds.size();i++)
if (FD_ISSET (sockfds[i], &read_fd_set)) {
n = recv(sockfds[i],buffer,255, 0);
buffer[n]=0;
if (n < 0) error("ERROR reading from socket");
if (n==0) error ("client closed socket, exiting");
printf("Here is the message: %s\n",buffer);
//update state
if (buffer[0]=='t') {
int32_t time;
memcpy(&time, buffer+1, sizeof(int32_t));
time=ntohl(time);
state.timestep=time;
} else if (buffer[0]=='i') {
int32_t iso;
memcpy(&iso, buffer+1, sizeof(int32_t));
iso=ntohl(iso);
state.timestep=iso;
} else if (buffer[0]=='n') {
int32_t ncfg;
memcpy(&ncfg, buffer+1, sizeof(int32_t));
ncfg=ntohl(ncfg);
state.timestep=ncfg;
} else if (buffer[0]=='s') {
state.showatoms=buffer[1]!=0;
} else {
fprintf (stderr, "Unknown state request %c\n", buffer[0]);
error ("unknown state" );
}
for (unsigned j=1;j<sockfds.size();j++) {
n = send(sockfds[j], buffer , n, 0);
if (n < 0) error("ERROR writing to socket");
}
}
//unblockingly see if new connections were made and add to sockfds
if (FD_ISSET (sockfds[0], &read_fd_set)) {
if (initNewSocket (secret));
FD_SET (sockfds.back(), &active_fd_set);
}
}
#ifdef WIN32
WSACleanup();
#endif
return 0;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment