marcelb
/
socket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: marcelb:win-support
Branches Tags
marcelb:cleaning
marcelb:dev
marcelb:mc-support
marcelb:pool
marcelb:queue
marcelb:read-write-limit
marcelb:testing
marcelb:win-support
..
compare: marcelb:dev
Branches Tags
marcelb:cleaning
marcelb:dev
marcelb:mc-support
marcelb:pool
marcelb:queue
marcelb:read-write-limit
marcelb:testing
marcelb:win-support

No commits in common. 'win-support' and 'dev' have entirely different histories.
win-suppor ... dev

11 changed files with 144 additions and 181 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 13
      lib/ip.hpp
  2. 83
      lib/tcp_socket.hpp
  3. 202
      src/tcp_socket.cpp
  4. 6
      test/client.cpp
  5. BIN
      test/client.exe
  6. BIN
      test/client.o
  7. 1
      test/compile-client.ps1
  8. 1
      test/compile-server.ps1
  9. 19
      test/server.cpp
  10. BIN
      test/server.exe
  11. BIN
      test/server.o

13
lib/ip.hpp
Unescape View File

@ -4,16 +4,9 @@
#include <iostream>
#include <string>
#include <string.h>
#if __linux__
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
#elif _WIN32
// #include <sstream>
#include <WinSock.h>
#include <ws2tcpip.h>
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
using namespace std;

83
lib/tcp_socket.hpp
Unescape View File

@ -3,32 +3,17 @@
#include <iostream>
#include <string>
#include <vector>
#include <string.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#if __linux__
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
#elif _WIN32
#include <WinSock.h>
#include <ws2tcpip.h>
#pragma comment(lib,"ws2_32.lib")
#define ushort u_short
#define uint u_int
#endif
#include "ip.hpp"
using namespace std;
class client;
// class secure;
// class server;
/**
* Server klasa za TCP/IP soket
* Instanca se incijalizira kada pokrećemo server
@ -36,22 +21,12 @@ class client;
class server {
public:
#if __linux__
int sock;
#elif _WIN32
WSADATA wsa;
SOCKET sock;
#endif
int sock;
struct sockaddr_in addr;
SSL_CTX* securefds = NULL;
server (const ushort port, const uint limit = 1000, SSL_CTX* _securefds = NULL);
server (const ushort port, const uint limit = 1000);
~server ();
// one klijent
client* cli;
void accept(const uint timeout = 100);
};
/**
@ -76,28 +51,40 @@ class secure {
class client {
public:
// zajedničke
#if __linux__
int conn; // mijenja sock
#elif _WIN32
WSADATA wsa;
SOCKET conn; // mijenja sock
#endif
int sock;
struct sockaddr_in addr;
SSL* ssl = NULL;
// server s klijentima
const server* srv;
// klijent sa serverom
string ipv4;
string ipv6;
// konstruktor za klijente bez servera
client (const string address, const ushort port, const uint timeout = 100, SSL_CTX* securefds = NULL);
// konstruktor za klijente sa serverom
client (const server *_srv, const uint timeout = 100, SSL_CTX* securefds = NULL);
~client ();
bool push (const string msg);
string pull (size_t byte_limit = 1024);
bool tell (const string msg);
string obey (size_t byte_limit = 1024);
};
/**
* Klasa za inicijalizaciju dolaznih veza
* Definira se na serverskom tipu aplikacija i predstavlja identifikator klijenta
*/
class comming {
public:
const server *srv;
struct sockaddr_in addr;
int conn;
string ipv4;
string ipv6;
SSL* ssl = NULL;
comming(const server *_srv, const uint timeout = 100, SSL_CTX* securefds = NULL);
~comming();
bool tell (const string msg);
string obey (size_t byte_limit = 1024);
};
#endif

202
src/tcp_socket.cpp
Unescape View File

@ -4,19 +4,12 @@
* Kontrustruktor varijable tipa server, prima port i limit za ograničenje liste klijenata na čekanju
*/
server::server (const ushort port, const uint limit, SSL_CTX* _securefds) {
securefds = _securefds;
server::server (const ushort port, const uint limit) {
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(port);
#if _WIN32
if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) {
throw string("[ERROR] WSA Startup. Detail: " + to_string(WSAGetLastError()));
}
#endif
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock <= 0) {
throw string("[ERROR] Unable to open TCP socket ");
@ -24,16 +17,9 @@ server::server (const ushort port, const uint limit, SSL_CTX* _securefds) {
}
int opt=1;
#if __linux__
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) {
throw string("[ERROR] Unable to set REUSEADDR or REUSEPORT on socket ");
}
#elif _WIN32
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt))) {
throw string("[ERROR] Unable to set REUSEADDR or REUSEPORT on socket ");
}
#endif
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) {
throw string("[ERROR] Unable to set REUSEADDR or REUSEPORT on socket ");
}
if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) {
throw string("[ERROR] Unable to bind socket ");
@ -45,10 +31,6 @@ server::server (const ushort port, const uint limit, SSL_CTX* _securefds) {
}
void server::accept(const uint timeout) {
cli = new client(this, timeout, securefds);
}
/**
* Destruktor varijable tipa server
*/
@ -56,28 +38,14 @@ void server::accept(const uint timeout) {
server::~server () {
cli->~client();
cli = NULL;
if (sock<=0) {
throw string("[ERROR] The socket is already closed ");
}
else {
#if __linux__
if (close(sock) != 0) {
throw string("[ERROR] Unable to close socket ");
}
#elif _WIN32
if (closesocket(sock) != 0) {
throw string("[ERROR] Unable to close socket ");
}
WSACleanup();
#endif
else if (close(sock) != 0) {
throw string("[ERROR] Unable to close socket ");
}
}
/**
@ -142,14 +110,8 @@ secure::~secure () {
client::client(const string address, const ushort port, const uint timeout, SSL_CTX* securefds) {
#if _WIN32
if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) {
throw string("[ERROR] Unable to set WinSock " + to_string(WSAGetLastError()));
}
#endif
conn = socket(AF_INET, SOCK_STREAM, 0);
if (conn < 0) {
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) {
throw string("[ERROR] Unable to open TCP socket ");
}
@ -159,31 +121,24 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
addr.sin_addr.s_addr = inet_addr(_address.c_str());
addr.sin_port = htons(port);
if (connect(conn, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) != 0) {
if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) != 0) {
throw string("Unable to connect to server ");
}
#if __linux__
struct timeval tv;
tv.tv_sec = timeout/1000;
tv.tv_usec = (timeout%1000)*1000;
struct timeval tv;
tv.tv_sec = timeout/1000;
tv.tv_usec = (timeout%1000)*1000;
if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
throw string("[ERROR] Unable to set timeout ");
}
#elif _WIN32
DWORD tv = timeout;
if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv))) {
throw string("[ERROR] Unable to set timeout ");
}
#endif
if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
throw string("[ERROR] Unable to set timeout ");
}
if (securefds) {
ssl = SSL_new(securefds);
if (!ssl) {
throw string("[ERROR] Creating SSL object ");
}
SSL_set_fd(ssl, conn);
SSL_set_fd(ssl, sock);
// Perform the SSL handshake
if (SSL_connect(ssl) <= 0) {
@ -195,6 +150,65 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
}
/**
* Destruktor varijable tipa client
*/
client::~client () {
if (ssl) {
SSL_shutdown(ssl);
SSL_free(ssl);
}
if (sock <= 0) {
throw string("[ERROR] The socket is already closed ");
}
else if (close(sock) != 0) {
throw string("[ERROR] Unable to close socket ");
}
}
/**
* Metoda klase client za slanje podataka preko soketa
* Prima string koji će biti poslan
* Vraća logički statu poređenja psolanih karaktera i karaktera u stringu
*/
bool client::tell (const string msg) {
size_t sended = 0;
if (ssl) {
sended = SSL_write(ssl, msg.c_str(), msg.length());
}
else {
sended = write(sock, msg.c_str(), msg.length());
}
return sended == msg.length();
}
/**
* Metoda klase client za primanje poruke preko soketa
* Prima dozvoljeni broj karaktera koji će primiti
* Vraća string primljene poruke
*/
string client::obey (size_t byte_limit) {
char res[byte_limit] = {0};
if (ssl) {
SSL_read(ssl, res, byte_limit);
}
else {
read(sock , res, byte_limit);
}
return string(res);
}
/**
* Konstruktor varijable tipa commint
* Prima pokazivač na inicijaliziranu varijablu tipa, port,
@ -203,7 +217,7 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
*/
client::client(const server *_srv, const uint timeout, SSL_CTX* securefds) {
comming::comming(const server *_srv, const uint timeout, SSL_CTX* securefds) {
srv = _srv;
socklen_t len = sizeof(struct sockaddr_in);
@ -211,23 +225,13 @@ client::client(const server *_srv, const uint timeout, SSL_CTX* securefds) {
throw string("[ERROR] Unable to accept client connection ");
}
#if __linux__
struct timeval tv;
tv.tv_sec = timeout/1000;
tv.tv_usec = (timeout%1000)*1000;
if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
throw string("[ERROR] Unable to set timeout ");
}
#elif _WIN32
DWORD tv = timeout;
if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv))) {
throw string("[ERROR] Unable to set timeout ");
}
#endif
struct timeval tv;
tv.tv_sec = timeout/1000;
tv.tv_usec = (timeout%1000)*1000;
if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
throw string("[ERROR] Unable to set timeout ");
}
if (securefds) {
@ -255,12 +259,11 @@ client::client(const server *_srv, const uint timeout, SSL_CTX* securefds) {
}
/**
* Destruktor varijable tipa client
* Destruktor varijable tipa comming
*/
client::~client () {
comming::~comming() {
if (ssl) {
SSL_shutdown(ssl);
@ -271,57 +274,44 @@ client::~client () {
throw string("[ERROR] The socket is already closed ");
}
else {
#if __linux__
if (close(conn) != 0) {
throw string("[ERROR] Unable to close socket ");
}
#elif _WIN32
if (closesocket(conn) != 0) {
throw string("[ERROR] Unable to close socket ");
}
//WSACleanup();
#endif
else if (close(conn) != 0) {
throw string("[ERROR] Unable to close socket ");
}
}
/**
* Metoda klase client za slanje podataka preko soketa
* Metoda klase comming za slanje podataka preko soketa
* Prima string koji će biti poslan
* Vraća logički statu poređenja psolanih karaktera i karaktera u stringu
*/
bool client::push (const string msg) {
size_t sended = 0;
bool comming::tell (const string msg) {
ssize_t sended = 0;
if (ssl) {
sended = SSL_write(ssl, msg.c_str(), msg.length());
}
else {
sended = send(conn, msg.c_str(), msg.length(), 0);
sended = write(conn, msg.c_str(), msg.length());
}
return sended == msg.length();
}
/**
* Metoda klase client za primanje poruke preko soketa
* Metoda klase comming za primanje poruke preko soketa
* Prima dozvoljeni broj karaktera koji će primiti
* Vraća string primljene poruke
*/
string client::pull (size_t byte_limit) {
char res[byte_limit] = {0};
string comming::obey (size_t byte_limit) {
char res[byte_limit] = {0};
if (ssl) {
SSL_read(ssl, res, byte_limit);
}
else {
recv(conn , res, byte_limit, 0);
read(conn , res, byte_limit);
}
return string(res);
}

6
test/client.cpp
Unescape View File

@ -11,16 +11,16 @@ int main() {
secure crypto;
cout << "init cert " << endl;
client myserver("localhost", 8000, 5000, crypto.fds);
client myserver("127.0.0.1", 5000, 5000, crypto.fds);
// client myserver("localhost", 5000);
cout << "init client " << endl;
string sends = "Hello world!";
cout << myserver.push(sends) << " " << sends.length() << endl;
cout << myserver.tell(sends) << " " << sends.length() << endl;
cout << "wait client " << endl;
cout << myserver.pull();
cout << myserver.obey();
}
catch (const string err) {

BIN
test/client.exe
View File

Binary file not shown.

BIN
test/client.o
View File

Binary file not shown.

1
test/compile-client.ps1
Unescape View File

@ -1 +0,0 @@
g++ client.cpp ../src/* -o client.exe -lssl -lcrypto -lws2_32

1
test/compile-server.ps1
Unescape View File

@ -1 +0,0 @@
g++ server.cpp ../src/* -o server.exe -lssl -lcrypto -lws2_32

19
test/server.cpp
Unescape View File

@ -6,26 +6,21 @@ using namespace std;
int main() {
try{
cout << "init server " << endl;
server myserver(5000);
cout << "init cert " << endl;
secure crypto ("../example/cert.pem", "../example/privkey.pem");
cout << "init server " << endl;
server myserver(8000, 100, crypto.fds);
cout << "init client " << endl;
// client myclient(&myserver, 100, crypto.fds);
comming myclient(&myserver, 100, crypto.fds);
// comming myclient(&myserver, 100);
myserver.accept();
// cout << "wait client " << myclient.ipv4 << endl;
cout << "wait client " << myserver.cli->ipv4 << endl;
cout << "wait client " << myclient.ipv4 << endl;
string fromclient = myserver.cli->pull();
// string fromclient = myclient.pull();
string fromclient = myclient.obey();
cout << "tell client " << fromclient << endl;
// usleep(600*1000);
//sleep(5);
myserver.cli->push(fromclient);
// myclient.push(fromclient);
sleep(5);
myclient.tell(fromclient);
// myclient.~comming();
// while (true) {

BIN
test/server.exe
View File

Binary file not shown.

BIN
test/server.o
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save