14 Commits
0.0.1 ... 3.0.0

Author SHA1 Message Date
fe32554e3c Blocked Clients, Colored Console, Auto Dir Create 2020-10-28 15:34:51 +01:00
ddada8bb82 LDAP Login, Makefile, Output Color 2020-10-27 18:19:21 +01:00
7afb97993e Pthread bugfix, readme, makefile 2020-10-26 20:57:54 +01:00
ef7dfdd80b RM Old Code 2020-10-26 13:00:36 +01:00
356d9e3463 1. Teil komplett 2020-10-26 12:55:39 +01:00
a6dae92de1 Makefile added 2020-10-14 16:05:43 +02:00
250fd16e24 Kommentare 2020-10-14 15:58:14 +02:00
a1cc0dfce7 Bugfixes, List stopt nicht 2020-10-02 07:51:35 -07:00
3d54d01d2e LIST fertig 2020-10-02 06:50:36 -07:00
256aaab8fb Dir -> Post-Ein/Ausgang 2020-10-01 02:57:23 -07:00
6781ac89ad GetUserMessages bug fix 2020-09-30 15:11:32 -07:00
c80b787341 Added jetzt sender und Empfänger ins Dir 2020-09-30 13:46:28 -07:00
6f7f4eab08 Send speichert 2020-09-30 11:35:49 -07:00
bdca2a5394 Server -> Error 2020-09-30 08:23:11 -07:00
7 changed files with 1334 additions and 219 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.vscode/

248
client.c Normal file
View File

@ -0,0 +1,248 @@
/* myclient.c */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
#include <termios.h>
#define BUF 1024
void remN(char *s) {
char *p2 = s;
while(*s != '\0') {
if(*s != '\t' && *s != '\n') {
*p2++ = *s++;
} else {
++s;
}
}
*p2 = '\0';
}
bool startsWith(const char *pre, const char *str)
{
size_t lenpre = strlen(pre),
lenstr = strlen(str);
return lenstr < lenpre ? false : memcmp(pre, str, lenpre) == 0;
}
int main (int argc, char **argv) {
int create_socket;
char buffer[BUF];
struct sockaddr_in address;
int size;
if( argc < 3 ){
printf("Usage: %s ServerAdresse Port\n", argv[0]);
exit(EXIT_FAILURE);
}
if ((create_socket = socket (AF_INET, SOCK_STREAM, 0)) == -1)
{
perror("Socket error");
return EXIT_FAILURE;
}
memset(&address,0,sizeof(address));
address.sin_family = AF_INET;
address.sin_port = htons (atoi(argv[2]));
inet_aton (argv[1], &address.sin_addr);
if (connect ( create_socket, (struct sockaddr *) &address, sizeof (address)) == 0)
{
printf ("\x1b[32mConnection with server (%s) established\n\x1b[0m", inet_ntoa (address.sin_addr));
size=recv(create_socket,buffer,BUF-1, 0);
if (size>0)
{
buffer[size]= '\0';
printf("\x1b[36m%s\x1b[0m",buffer);
}
}
else
{
perror("\x1b[31mConnect error - no server available\x1b[0m");
return EXIT_FAILURE;
}
bool login = false;
do {
//command vom user überprüfen
char command[7] = "";
printf ("\n\x1b[35mEnter Command:\x1b[0m \n");
fgets (command, 7, stdin);
if (startsWith("login", command) == true && login == false)
{
char username[10] = "";
char pw[50] = "";
char bufferString[BUF] = "";
strcpy(bufferString, "login;");
//User Dateneingabe und daten einlesen
printf("\x1b[35m<Username max. 8 Zeichen>\x1b[0m\n");
fgets (username, 10, stdin);
printf("\x1b[35m<Passwort max. 50 Zeichen>\x1b[0m\n");
//PW eingabe unsichtbar machen
struct termios term, term_orig;
tcgetattr(STDIN_FILENO, &term);
term_orig = term;
term.c_lflag &= ~ECHO;
tcsetattr(STDIN_FILENO, TCSANOW, &term);
scanf("%s", pw);
// Eingabe wieder sichtbar schalten
tcsetattr(STDIN_FILENO, TCSANOW, &term_orig);
strcat(bufferString, username);
strcat(bufferString, ";");
strcat(bufferString, pw);
remN(bufferString);
send(create_socket, bufferString, strlen (bufferString), 0);
//Response vom Server (OK oder ERR) empfangen und ausgeben
char readBuffer[BUF] = "";
read(create_socket , readBuffer, 1023);
remN(readBuffer);
if (strcmp("OK", readBuffer) == 0)
{
printf("\n\x1b[32m%s\x1b[0m\n", readBuffer);
login = true;
}else if (strcmp("ERR", readBuffer) == 0 || strcmp("Client Gesperrt", readBuffer) == 0)
{
printf("\n\x1b[31m%s\x1b[0m\n", readBuffer);
}
}else if (login == false && startsWith("quit", command) == true)
{
strcpy(buffer, "quit\n");
}else if (login == false)
{
printf("\x1b[33mBitte zuerst <login> eingeben. Erst danach können sie auf das Program zugreifen!\x1b[0m\n");
}
if(login == true){
//je nach command wird was audgeführt
if(startsWith("send", command) == true) {
char sender[10] = "";
char empfaenger[10] = "";
char betreff[82] = "";
char nachricht[128] = "";
char bufferString[BUF] = "";
strcpy(bufferString, "");
strcat(bufferString, "send");
//User Dateneingabe und daten einlesen
printf("\x1b[35m<Sender max. 8 Zeichen>\x1b[0m\n");
fgets (sender, 10, stdin);
printf("\x1b[35m<Empfänger max. 8 Zeichen>\x1b[0m\n");
fgets (empfaenger, 10, stdin);
printf("\x1b[35m<Betreff max. 80 Zeichen>\x1b[0m\n");
fgets (betreff, 82, stdin);
printf("\x1b[35m<Nachricht, beliebige Anzahl an Zeilen>\x1b[0m\n");
fgets (nachricht, 82, stdin);
//Buffer formatieren
strcat(bufferString, ";");
strcat(bufferString, sender);
strcat(bufferString, ";");
strcat(bufferString, empfaenger);
strcat(bufferString, ";");
strcat(bufferString, betreff);
strcat(bufferString, ";");
strcat(bufferString, nachricht);
remN(bufferString);
send(create_socket, bufferString, strlen (bufferString), 0);
//Response vom Server (OK oder ERR) empfangen und ausgeben
char readBuffer[BUF] = "";
read(create_socket , readBuffer, 1024);
printf("\n%s\n", readBuffer);
}else if(startsWith("list", command) == true) {
char bufferString[BUF] = "list";
char username[10] = "";
char p[22] = "";
int counter = 0;
printf("\x1b[35m<Username max. 8 Zeichen>\x1b[0m\n");
fgets (username, 10, stdin);
printf("\x1b[35m<Posteingang oder Postausgang>\x1b[0m\n");
fgets (p, 22, stdin);
strcat(bufferString, ";");
strcat(bufferString, username);
strcat(bufferString, ";");
strcat(bufferString, p);
remN(bufferString);
send(create_socket, bufferString, strlen (bufferString), 0);
char readBuffer[BUF] = "";
read(create_socket , readBuffer, 1024);
char delimiter[] = ";";
char *ptr;
ptr = strtok(readBuffer, delimiter);
while(ptr != NULL) {
if(strcmp(ptr, ".") == 0) {
}else if(strcmp(ptr, "..") == 0) {
}else if (counter == 0) {
printf("\x1b[35m<Anzahl der Nachrichten für den User: %s>\x1b[0m\n", ptr);
}else {
printf("Betreff: %s \n", ptr);
}
counter = counter + 1;
// naechsten Abschnitt erstellen
ptr = strtok(NULL, delimiter);
}
}else if(startsWith("read", command) == true) {
char bufferString[BUF] = "read";
char username[10] = "";
char nid[82] = "";
char folder[22] = "";
printf("\x1b[35m<Username max. 8 Zeichen>\x1b[0m\n");
fgets (username, 10, stdin);
printf("\x1b[35m<posteingang oder postausgang>\x1b[0m\n");
fgets (folder, 22, stdin);
printf("\x1b[35m<Nachrichten-Nummer>\x1b[0m\n");
fgets (nid, 82, stdin);
strcat(bufferString, ";");
strcat(bufferString, username);
strcat(bufferString, ";");
strcat(bufferString, folder);
strcat(bufferString, ";");
strcat(bufferString, nid);
remN(bufferString);
send(create_socket, bufferString, strlen (bufferString), 0);
char readBuffer[BUF] = "";
read(create_socket , readBuffer, 1000);
printf("\n%s\n", readBuffer );
}else if(startsWith("del", command) == true) {
char username[10] = "";
char nachrichtennummer[82] = "";
char bufferString[BUF] = "del";
char p[22] = "";
printf("\x1b[35m<Username max. 8 Zeichen>\x1b[0m\n");
fgets (username, 10, stdin);
printf("\x1b[35m<Posteingang oder Postausgang>\x1b[0m\n");
fgets (p, 22, stdin);
printf("\x1b[35m<Nachrichten-Nummer>\x1b[0m\n");
fgets (nachrichtennummer, 82, stdin);
strcat(bufferString, ";");
strcat(bufferString, username);
strcat(bufferString, ";");
strcat(bufferString, p);
strcat(bufferString, ";");
strcat(bufferString, nachrichtennummer);
remN(bufferString);
send(create_socket, bufferString, strlen (bufferString), 0);
char readBuffer[BUF] = "";
read(create_socket , readBuffer, 1024);
printf("\n%s\n", readBuffer );
}else if(startsWith("quit", command) == true) {
strcpy(buffer, "quit\n");
}else {
printf("DAS IST KEIN COMMAND!!!!!");
}
}
}while (strcmp (buffer, "quit\n") != 0);
close (create_socket);
return EXIT_SUCCESS;
}

26
makefile Executable file
View File

@ -0,0 +1,26 @@
#Client und Server kompilieren
all: server.c client.c
gcc -Wall -o server server.c -lldap -llber -lpthread
gcc -Wall -o client client.c -lldap -llber -lpthread
#Kompilierten Client und Server löschen
clean: client server
rm -f client server
#Nur den Client kompilieren:
client: client.c
gcc -Wall -o client client.c -lldap -llber -lpthread
#Nur den Server kompilieren:
server: server.c
gcc -Wall -o server server.c -lldap -llber -lpthread
#Kompilierten Server löschen
cleanS: server
rm -f server
#Kompilierten Client löschen
cleanC: client
rm -f client

View File

@ -1,104 +0,0 @@
/* myclient.c */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#define BUF 1024
#define PORT 6543
int main (int argc, char **argv) {
char* meinport = argv[2];
int create_socket;
char buffer[BUF];
struct sockaddr_in address;
int size;
if( argc < 2 ){
printf("Usage: %s ServerAdresse\n", argv[0]);
exit(EXIT_FAILURE);
}
if ((create_socket = socket (AF_INET, SOCK_STREAM, 0)) == -1)
{
perror("Socket error");
return EXIT_FAILURE;
}
memset(&address,0,sizeof(address));
address.sin_family = AF_INET;
address.sin_port = htons (*meinport);
inet_aton (argv[1], &address.sin_addr);
if (connect ( create_socket, (struct sockaddr *) &address, sizeof (address)) == 0)
{
printf ("Connection with server (%s) established\n", inet_ntoa (address.sin_addr));
size=recv(create_socket,buffer,BUF-1, 0);
if (size>0)
{
buffer[size]= '\0';
printf("%s",buffer);
}
}
else
{
perror("Connect error - no server available");
return EXIT_FAILURE;
}
int last = 0;
int mode = 0;
char bufferString[1024];
do {
char *p=getenv("USER");
printf("\x1B[32m");
printf("%s@%s:%d", p, inet_ntoa (address.sin_addr),ntohs(address.sin_port));
if (strncmp (bufferString, "send", 4) == 0 || mode == 1){
switch (last)
{
case 0:
last += 1;
mode = 1;
printf("\x1B[34m");
printf("->SEND->Sender eingeben: \n");
break;
case 1:
last += 1;
printf("\x1B[34m");
printf("->SEND->Empfänger eingeben: \n");
break;
case 2:
last += 1;
printf("\x1B[34m");
printf("->SEND->Betreff eingeben: \n");
break;
case 3:
last = 0;
mode = 0;
printf("\x1B[34m");
printf("->SEND->Nachricht eingeben: \n");
break;
}
}else if (strncmp (bufferString, "list", 4) == 0 ){
printf("LIST wurde endlich erkannt!\n");
}else if (strncmp (bufferString, "read", 4) == 0 ){
printf("READ wurde endlich erkannt!\n");
} else if (strncmp (bufferString, "del", 4) == 0 ){
printf("DEL wurde endlich erkannt!\n");
}
printf("\033[0;33m");
printf("$ ");
printf("\x1B[37m");
fgets (buffer, BUF, stdin);
strcpy(bufferString, buffer);
printf("%s", bufferString);
send(create_socket, buffer, strlen (buffer), 0);
}
while (strcmp (buffer, "quit\n") != 0);
close (create_socket);
return EXIT_SUCCESS;
}

View File

@ -1,115 +0,0 @@
/* myserver.c */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#define BUF 1024
#define PORT 6543
int main (int argc, char **argv) {
char* verzeichnis = argv[1];
char* meinport = argv[2];
printf("Mein server Verzeichniss: %s\n", verzeichnis);
printf("Mein server Port: %s\n", meinport);
int create_socket, new_socket;
socklen_t addrlen;
char buffer[BUF];
int size;
struct sockaddr_in address, cliaddress;
create_socket = socket (AF_INET, SOCK_STREAM, 0);
memset(&address,0,sizeof(address));
address.sin_family = AF_INET;
address.sin_addr.s_addr = INADDR_ANY;
address.sin_port = htons (*meinport);
if (bind ( create_socket, (struct sockaddr *) &address, sizeof (address)) != 0) {
perror("bind error");
return EXIT_FAILURE;
}
listen (create_socket, 5);
addrlen = sizeof (struct sockaddr_in);
while (1) {
printf("Waiting for connections...\n");
new_socket = accept ( create_socket, (struct sockaddr *) &cliaddress, &addrlen );
if (new_socket > 0)
{
printf ("Client connected from %s:%d...\n", inet_ntoa (cliaddress.sin_addr),ntohs(cliaddress.sin_port));
strcpy(buffer,"Welcome to myserver, Please enter your command:\n");
send(new_socket, buffer, strlen(buffer),0);
}
char bufferString[BUF];
int last = 0;
int mode = 0;
do {
size = read (new_socket, buffer, BUF-1);
if( size > 0)
{
buffer[size] = '\0';
strcpy(bufferString, buffer);
if (strncmp (bufferString, "send", 4) == 0 || mode == 1){
switch (last)
{
case 0:
last += 1;
mode = 1;
printf("\x1B[34m");
printf("->SEND:\x1B[33m %s\n", bufferString);
break;
case 1:
last += 1;
printf("\x1B[34m");
printf("->SEND->Sender wurde eingegeben:\x1B[33m %s\n", bufferString);
break;
case 2:
last += 1;
printf("\x1B[34m");
printf("->SEND->Empfänger wurde eingegeben:\x1B[33m %s\n", bufferString);
break;
case 3:
last += 1;
printf("\x1B[34m");
printf("->SEND->Betreff wurde eingegeben:\x1B[33m %s\n", bufferString);
break;
case 4:
last = 0;
mode = 0;
printf("\x1B[34m");
printf("->SEND->Nachricht wurde eingegeben:\x1B[33m %s\n", bufferString);
break;
}
}else if (strncmp (bufferString, "list", 4) == 0 ){
printf("LIST wurde endlich erkannt!\n");
}else if (strncmp (bufferString, "read", 4) == 0 ){
printf("READ wurde endlich erkannt!\n");
} else if (strncmp (bufferString, "del", 4) == 0 ){
printf("DEL wurde endlich erkannt!\n");
}else {
printf ("\x1B[33mBefehl wurde nicht erkannt: \x1B[31m%s\n", bufferString);
}
printf("\x1B[37m");
}
else if (size == 0)
{
printf("Client closed remote socket\n");
break;
}
else
{
perror("recv error");
return EXIT_FAILURE;
}
} while ( strncmp (buffer, "quit", 4) != 0);
close (new_socket);
}
close (create_socket);
return EXIT_SUCCESS;
}

20
readme.md Normal file
View File

@ -0,0 +1,20 @@
# Protokoll 🔧
```
SEND: send;sender;empänger;betreff;nachricht
LIST: list:username;postEinAusgang
READ: read;username;postEinAusgang;nid
DEL: del;username;postEinAusgang;nid
```
# Installation
```
sudo apt-install ldap-utils
sudo apt-get install libldap
```
# Erstellt von
* Lukas Nowy
* Georg Reisinger

1039
server.c Normal file

File diff suppressed because it is too large Load Diff