nikola/diplomska_naloga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change typedef

Browse Source
This commit is contained in:
Nikola Petrov 2025-01-24 10:49:08 +01:00
parent ec7b293bd5
commit 8ffb7c10d5
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/server.cpp
View File

@ -5,25 +5,26 @@ using namespace std;
// use pthread rw_lock to lock db so you can safy clone .db file // use pthread rw_lock to lock db so you can safy clone .db file
// When a new client connected:
void call(int sock, sockaddr_in newSocketInfo)
{
std::cout << "new User" << std::endl;
char tempBuffer[AS_DEFAULT_BUFFER_SIZE + 1];
ssize_t messageLength;
while ((messageLength = TcpSocket::recvt(sock, tempBuffer, AS_DEFAULT_BUFFER_SIZE)) > 0)
{
tempBuffer[messageLength] = '\0';
TcpSocket::sendt(sock, tempBuffer, messageLength);
}
std::cout << "del USER" << std::endl;
TcpSocket::closet(sock);
}
int main() int main()
{ {
// When a new client connected:
TcpSocket::OnNewConnectionCallBack onNewConnection = [](int sock, sockaddr_in newSocketInfo)
{
std::cout << "new User" << std::endl;
char tempBuffer[AS_DEFAULT_BUFFER_SIZE + 1];
ssize_t messageLength;
while ((messageLength = TcpSocket::recvt(sock, tempBuffer, AS_DEFAULT_BUFFER_SIZE)) > 0)
{
tempBuffer[messageLength] = '\0';
TcpSocket::sendt(sock, tempBuffer, messageLength);
}
std::cout << "del USER" << std::endl;
TcpSocket::closet(sock);
};
// Bind the server to a port. // Bind the server to a port.
int err = TcpSocket::listent("0.0.0.0", 8888, onNewConnection); int err = TcpSocket::listent("0.0.0.0", 8888, call);
if (err < 0) if (err < 0)
{ {
printf("ERROR %d", err); printf("ERROR %d", err);

5
shared/inc/TcpSocket.hpp
View File

@ -1,6 +1,3 @@
#include <functional>
#include <string> #include <string>
#include <netinet/in.h> #include <netinet/in.h>
@ -22,7 +19,7 @@ namespace TcpSocket
int remotePort(sockaddr_in &address); int remotePort(sockaddr_in &address);
int connectt(const char *host, uint16_t port); int connectt(const char *host, uint16_t port);
typedef std::function<void(int sock, sockaddr_in newSocketInfo)> OnNewConnectionCallBack; typedef void(OnNewConnectionCallBack)(int sock, sockaddr_in newSocketInfo);
int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback); int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback);
} // namespace TcpSocket } // namespace TcpSocket

3
shared/src/TcpSocket.cpp
View File

@ -1,3 +1,4 @@
#include "TcpSocket.hpp"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -95,8 +96,6 @@ namespace TcpSocket
return sock; return sock;
} }
typedef std::function<void(int sock, sockaddr_in newSocketInfo)> OnNewConnectionCallBack;
int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback) int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback)
{ {
sockaddr_in address; sockaddr_in address;