Bazsalanszky/Theta
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added offline messages to home page

Browse source
This commit is contained in:
Balazs Toldi 2019-11-15 22:42:20 +01:00
parent f02b2c4776
commit 638a12f96b
7 changed files with 87 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -1,5 +1,6 @@
# P2P-chat
[![Build Status](https://travis-ci.com/Bazsalanszky/p2p-chat.svg?branch=master)](https://travis-ci.com/Bazsalanszky/p2p-chat)
A projektem célja (ahogy a neve is mondja) egy Peer to Peer chat alkalmazás létrehozása. A lénye az, hogy több gép egy hálózatot alkotva kommunikál egymással,azaz nincs egy központi szerver,ami az üzeneteket továbbítja a klienseknek,hanem minden üzenet közvetlenül megy a feladótól a címzettig.

8
lib/net.h
View file

@ -3,7 +3,7 @@
// Datum: 2019. 11. 05.
//
#pragma once
#if defined(__linux__) || defined(__CYGWIN__)
#if defined(__linux__) && !defined(__CYGWIN__)
#include <errno.h>
#include <unistd.h>
#include <sys/uio.h>
@ -17,6 +17,7 @@
//Mappákhoz
#include <sys/stat.h>
#include <sys/sendfile.h>
#include <dirent.h>
//Winsock2 kompatiblitás érdekében
#ifndef SOCKET_ERROR
#define SOCKET_ERROR -1
@ -39,6 +40,11 @@ typedef int SOCKET;
#elif defined(WIN32) || defined(__CYGWIN__)
#ifdef __MINGW32__
#include <dirent.h>
#endif
#include <ws2tcpip.h>
#include <mswsock.h>
#pragma comment(lib, "ws2_32.lib")

2
modules/peer.c
View file

@ -104,7 +104,7 @@ int peer_ConnetctTo(char* ip, int port, PeerList* peerList, Node_data my, fd_set
}
}
//free(m.pairs);
//logger_log("Peer validated (%s->%s)!",inet_ntoa(hint.sin_addr),node.id);
logger_log("Peer validated (%s->%s)!",inet_ntoa(hint.sin_addr),node.id);
return 0;
}

3
modules/server.c
View file

@ -1,5 +1,6 @@
//
// Created by balazs on 2019. 11. 07..
// Készítette: Toldi Balázs Ádám
// Dátum: 2019. 11. 07.
//
#include "server.h"

86
modules/webio.c
View file

@ -3,6 +3,7 @@
// Dátum: 2019. 10. 14..
//
#include "webio.h"
int webio_create(Config config, struct Node_data myData, WebIO *webIo) {
char *port = map_getValue(config, "interface-port");
if (port == NULL)
@ -46,13 +47,13 @@ int webio_handleRequest(WebIO wio, const PeerList *list) {
return -1;
}
if (strncmp(buf, "GET",3) == 0) {
if (strncmp(buf, "GET", 3) == 0) {
char file[50];
sscanf(buf, "%*s %s", file);
res = webio_handleGETrequest(client, wio, file, list);
} else if (strncmp(buf, "POST",4) == 0) {
int i =(int) strlen(buf) - 1;
} else if (strncmp(buf, "POST", 4) == 0) {
int i = (int) strlen(buf) - 1;
while (buf[i] != '\n') {
i--;
}
@ -134,21 +135,20 @@ static int webio_handleGETrequest(SOCKET client, WebIO wio, char *file, const Pe
strcat(path, file);
//File küldés windows-on
#ifdef _WIN32
HANDLE file = CreateFileA(path,GENERIC_READ,FILE_SHARE_READ,
HANDLE file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
NULL);
DWORD size = GetFileSize(file,NULL);
if(file == INVALID_HANDLE_VALUE || size< 0)
DWORD size = GetFileSize(file, NULL);
if (file == INVALID_HANDLE_VALUE || size < 0)
webio_send404Page(client);
else {
webio_sendOKHeader_wSize(client,path,size);
webio_sendOKHeader_wSize(client, path, size);
TransmitFile(client, file, 0, 0, NULL, NULL, 0);
CloseHandle(file);
}
#else
logger_log(path);
int fd = open(path, O_RDONLY);
if (fd == -1)
webio_send404Page(client);
@ -167,17 +167,17 @@ static int webio_handleGETrequest(SOCKET client, WebIO wio, char *file, const Pe
}
}
#endif
shutdown(client,SD_BOTH);
shutdown(client, SD_BOTH);
}
closesocket(client);
return 0;
return 0;
}
static int webio_handlePOSTrequest(SOCKET client, WebIO wio, const PeerList *list, Map post) {
shutdown(client, SD_RECEIVE);
char *response = "HTTP/1.1 304 Not Modified ";
int res = send(client, response,(int) strlen(response), 0);
int res = send(client, response, (int) strlen(response), 0);
if (res == SOCKET_ERROR) {
logger_log("Error with io");
return -1;
@ -214,7 +214,7 @@ static int webio_handlePOSTrequest(SOCKET client, WebIO wio, const PeerList *lis
}
logger_log("Message sent to %s", map_getValue(post, "id"));
} else map_dump(post);
return 0;
return 0;
}
static void webio_getHeader(char *folder, char result[]) {
@ -251,8 +251,7 @@ static void webio_getIndex(char *folder, const PeerList *list, char *outputBuffe
"<a href=\"%s\">",
content, list->array[i].peerData.id);
if (strcmp(list->array[i].peerData.nick, "") != 0) {
sprintf(content, "%s%s %d- ", content, list->array[i].peerData.nick,
(int) strlen(list->array[i].peerData.nick));
sprintf(content, "%s%s - ", content, list->array[i].peerData.nick);
}
sprintf(content, "%s%s</a></li>\n", content, list->array[i].peerData.id);
}
@ -261,6 +260,50 @@ static void webio_getIndex(char *folder, const PeerList *list, char *outputBuffe
sprintf(content, "%s<div class=\"alert alert-warning\" role=\"alert\">\n"
" No peers connected!\n"
"</div>\n", content);
strcat(content, "<h1>Offline messages:</h1>\n");
char path[65];
sprintf(path, "%s/peers/", folder);
#ifdef _DIRENT_H_
DIR *d;
d = opendir(path);
if (d != NULL){
strcat(content, "<ul>\n");
struct dirent *de;
while ((de = readdir(d)) != NULL) {
if(strcmp(de->d_name,".") == 0 || strcmp(de->d_name,"..") == 0) continue;
char peer[33];
sscanf(de->d_name,"%[^.]",peer);
sprintf(content,"%s<li><a href=\"%s\">%s</a></li>",content, peer, peer);
}
closedir(d);
strcat(content, "</ul>\n");
}else{
sprintf(content, "%s<div class=\"alert alert-warning\" role=\"alert\">\n"
" No offline messages!\n"
"</div>\n", content);
}
#else
HANDLE dir;
WIN32_FIND_DATA file_data;
strcat(path,"/*");
if ((dir = FindFirstFile(path, &file_data)) == INVALID_HANDLE_VALUE)
sprintf(content, "%s<div class=\"alert alert-warning\" role=\"alert\">\n"
" No offline messages!\n"
"</div>\n", content);
else{
strcat(content, "<ul>\n");
do{
if(strcmp(file_data.cFileName,".") == 0 || strcmp(file_data.cFileName,"..") == 0) continue;
char peer[33];
sscanf(file_data.cFileName,"%[^.]",peer);
sprintf(content,"%s<li><a href=\"%s\">%s</a></li>",content, peer, peer);
}while(FindNextFile(dir,&file_data));
FindClose(dir);
}
#endif
sprintf(content, "%s<script>setTimeout(function(){\n"
" window.location.reload(1);\n"
"}, 5000);</script>\n"
@ -313,19 +356,20 @@ void webio_sendOKHeader(SOCKET socket, char *file) {
"Content-Encoding: gzip\r\n"
"Content-Language: en\r\n"
"Content-Type: %s\r\n\r\n", webio_getMIMEtype(file));
int res = send(socket, response, (int)strlen(response), 0);
int res = send(socket, response, (int) strlen(response), 0);
if (res == SOCKET_ERROR) {
logger_log("Error sending http ok header!");
}
}
void webio_sendOKHeader_wSize(SOCKET socket, char *file,int size) {
void webio_sendOKHeader_wSize(SOCKET socket, char *file, int size) {
char response[8192];
sprintf(response, "HTTP/1.1 200 OK "
"Content-Encoding: gzip\r\n"
"Content-Language: en\r\n"
"Content-Length: %d\r\n"
"Content-Type: %s\r\n\r\n",size, webio_getMIMEtype(file));
int res = send(socket, response,(int) strlen(response), 0);
"Content-Type: %s\r\n\r\n", size, webio_getMIMEtype(file));
int res = send(socket, response, (int) strlen(response), 0);
if (res == SOCKET_ERROR) {
logger_log("Error sending http ok header!");
}
@ -338,7 +382,7 @@ void webio_send404Page(SOCKET socket) {
"Content-Language: en\r\n"
"Content-Type: text/html\r\n\r\n"
"<h1>Error 404 File not found!</h1>";
int res = send(socket, response, (int)strlen(response), 0);
int res = send(socket, response, (int) strlen(response), 0);
if (res == SOCKET_ERROR) {
logger_log("Error sending 404 page!");
}
@ -347,9 +391,9 @@ void webio_send404Page(SOCKET socket) {
void webio_sendPage(SOCKET socket, char *content) {
char f[] = "index.html";
webio_sendOKHeader(socket, f);
int res = send(socket, content,(int) strlen(content), 0);
int res = send(socket, content, (int) strlen(content), 0);
if (res == SOCKET_ERROR) {
logger_log("Error sending page!");
}
shutdown(socket,SD_BOTH);
shutdown(socket, SD_BOTH);
}

9
modules/webio.h
View file

@ -1,6 +1,6 @@
//
// Készítette: Toldi Balázs Ádám
// Dátum: 2019. 10. 14..
// Dátum: 2019. 10. 14.
//
#pragma once
@ -9,9 +9,6 @@
#include "../lib/tcp-listener.h"
#include "peer.h"
#include "config.h"
#ifdef __MINGW32__
#include <dirent.h>
#endif
@ -44,9 +41,9 @@ static void webio_getPeerPage(char* folder, char *id, bool online, char *outputB
static bool webio_isPeerFound(char* folder,char* id);
static void webio_sendOKHeader(SOCKET socket,char* file);
static void webio_sendOKHeader_wSize(SOCKET socket,char* file,int size);
static void webio_sendPage(SOCKET socket, char* content);
static void webio_send404Page(SOCKET socket);
static void webio_send404Page(SOCKET socket);

13
test.c
View file

@ -5,12 +5,15 @@
//#include <ws2tcpip.h>
#include <stdio.h>
#include <stdlib.h>
#include "lib/map.h"
#include "lib/debugmalloc/debugmalloc.h"
int main(int argc , char **argv)
{
char buf[10] = "lma";
char buf2[10] = "lma";
sprintf(buf,"%c%s",'a',buf2);
printf("%s",buf);
Map m;
map_init(&m);
map_addPair(&m,map_make_pair("Test","1"));
//map_dump(m);
free(m.pairs);
return 0;
}