This commit is contained in:
ada-dmitry
2023-10-20 15:53:18 +03:00
parent 29db3dbe27
commit 0f8026a5bb
6 changed files with 243 additions and 181 deletions
Binary file not shown.
Binary file not shown.
+52 -20
View File
@@ -9,8 +9,19 @@
#include <unistd.h>
#include <time.h>
#define errExit(msg) do { perror(msg); _exit(EXIT_FAILURE); } while (0)
#define SerrExit(s,msg) do { close(s); perror(msg); _exit(EXIT_FAILURE); } while (0)
#define errExit(msg) \
do \
{ \
perror(msg); \
_exit(EXIT_FAILURE); \
} while (0)
#define SerrExit(s, msg) \
do \
{ \
close(s); \
perror(msg); \
_exit(EXIT_FAILURE); \
} while (0)
#define SERVER_PATH "/tmp/unix_sock.server"
#define CLIENT_PATH "unix_sock.client"
@@ -20,7 +31,8 @@
#define FINC "exit_c"
// #define INFO
int rcvBuffer(int sock_fd){
int rcvBuffer(int sock_fd)
{
int rcvBufferSize;
socklen_t sockOptSize = sizeof(rcvBufferSize);
getsockopt(sock_fd, SOL_SOCKET, SO_RCVBUF, &rcvBufferSize, &sockOptSize);
@@ -30,15 +42,18 @@ int rcvBuffer(int sock_fd){
return rcvBufferSize;
}
int recvCount(const void *s, int size){
int recvCount(const void *s, int size)
{
register int count;
register int mark;
register char *p;
p = (char *)s;
count = 0;
mark = 0;
do {
if (*p && !(*(p+1))) count++;
do
{
if (*p && !(*(p + 1)))
count++;
#ifdef INFO
printf("[%c][%X]\n", *p, *p);
#endif
@@ -48,7 +63,8 @@ int recvCount(const void *s, int size){
return count;
}
int main(int argc,char *argv[]){
int main(int argc, char *argv[])
{
int client_sock, rc, len;
struct sockaddr_un server_sockaddr;
@@ -64,55 +80,66 @@ int main(int argc,char *argv[]){
memset(&client_sockaddr, 0, sizeof(struct sockaddr_un));
client_sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (client_sock == -1) {
if (client_sock == -1)
{
perror("socket");
exit(1);
}
client_sockaddr.sun_family = AF_UNIX;
strcpy(client_sockaddr.sun_path, cpath);
unlink(cpath);
rc = bind(client_sock, (struct sockaddr *)&client_sockaddr, len);
if (rc == -1) SerrExit(client_sock,"bind");
if (rc == -1)
SerrExit(client_sock, "bind");
server_sockaddr.sun_family = AF_UNIX;
strcpy(server_sockaddr.sun_path, SERVER_PATH);
rc = connect(client_sock, (struct sockaddr *)&server_sockaddr, len);
if (rc == -1) SerrExit(client_sock,"connect");
if (rc == -1)
SerrExit(client_sock, "connect");
ibs = rcvBuffer(client_sock);
if ((ibuf=(char **)malloc(ibs)) == NULL ) errExit("malloc");
if ((ibuf = (char **)malloc(ibs)) == NULL)
errExit("malloc");
do {
do
{
memset(obuf, 0, obs);
printf("> ");
scanf("%s", obuf);
printf("Sending data...\n");
rc = send(client_sock, obuf, strlen(obuf) + 1, 0);
if (rc == -1) {
if (rc == -1)
{
perror("send");
close(client_sock);
exit(1);
} else {
}
else
{
printf("Data sent!\n");
}
printf("Waiting to recieve data...\n");
memset(ibuf, 0, ibs);
rc = recv(client_sock, ibuf, ibs, 0);
if (rc == -1) {
if (rc == -1)
{
perror("recv");
close(client_sock);
exit(1);
} else {
}
else
{
int c = recvCount(ibuf, ibs);
#ifdef INFO
char *p = (char *)ibuf;
printf("count: %d resieved\n", c);
for (int i = 0; i < 32; i++){
for (int i = 0; i < 32; i++)
{
printf("[%c][%X]", *p, *p);
p++;
}
@@ -122,9 +149,14 @@ int main(int argc,char *argv[]){
char p[obs];
char *tp = (char *)ibuf;
// if ((ibuf=(char **)malloc(ibs)) == NULL ) errExit("malloc");
for (int i = 0; i < c; i++){
for (int i = 0; i < c; i++)
{
memset(p, 0, obs);
while (*tp) {strncat(p,tp,1);tp++;}
while (*tp)
{
strncat(p, tp, 1);
tp++;
}
tp++;
// printf("DATA RECEIVED [%ld] = %s\n", strlen(ibuf[i]),ibuf[i]);
printf("DATA RECEIVED [%ld] = %s\n", strlen(p), p);
Binary file not shown.
Binary file not shown.
+52 -22
View File
@@ -11,7 +11,12 @@
#include <sys/wait.h>
#include <sys/types.h>
#define errExit(msg) do { perror(msg); _exit(EXIT_FAILURE); } while (0)
#define errExit(msg) \
do \
{ \
perror(msg); \
_exit(EXIT_FAILURE); \
} while (0)
#define SOCK_PATH "/tmp/unix_sock.server"
#define DATA "Hello from server"
@@ -19,12 +24,15 @@
#define FINS "exit_s"
#define FINC "exit_c"
void child_handler(int sig) {
void child_handler(int sig)
{
pid_t pid;
while((pid = waitpid(-1, NULL, WNOHANG)) > 0);
while ((pid = waitpid(-1, NULL, WNOHANG)) > 0)
;
}
void session(int client_sock, struct sockaddr_un server_sockaddr, struct sockaddr_un client_sockaddr){
void session(int client_sock, struct sockaddr_un server_sockaddr, struct sockaddr_un client_sockaddr)
{
int rc;
char inbuf[BUF];
char outbuf[BUF];
@@ -38,20 +46,27 @@ void session(int client_sock, struct sockaddr_un server_sockaddr, struct sockadd
len = sizeof(client_sockaddr);
rc = getpeername(client_sock, (struct sockaddr *)&client_sockaddr, &len);
if (rc == -1){
if (rc == -1)
{
close(client_sock);
errExit("getpeer");
} else {
}
else
{
printf("[%d] Client socket filepath: %s\n", pid, client_sockaddr.sun_path);
}
do {
do
{
printf("waiting for %s...\n", client_sockaddr.sun_path);
memset(inbuf, 0, bs);
bytes_rec = recv(client_sock, inbuf, bs, 0);
if (bytes_rec == -1){
if (bytes_rec == -1)
{
close(client_sock);
errExit("recv");
} else {
}
else
{
printf("[%s]: %s\n", client_sockaddr.sun_path, inbuf);
}
@@ -59,18 +74,26 @@ void session(int client_sock, struct sockaddr_un server_sockaddr, struct sockadd
strcpy(outbuf, DATA);
printf("Sending data...\n");
rc = send(client_sock, outbuf, strlen(outbuf) + 1, 0);
if (rc == -1) {
if (rc == -1)
{
close(client_sock);
errExit("send");
} else {
}
else
{
printf("Data sent!\n");
}
if (strcmp(inbuf,FINS) == 0 ) {kill(ppid,SIGTERM);break;}
if (strcmp(inbuf, FINS) == 0)
{
kill(ppid, SIGKILL);
break;
}
} while (strcmp(inbuf, FINC));
memset(outbuf, 0, bs);
sprintf(outbuf, "Exit %d\n", pid);
rc = send(client_sock, outbuf, strlen(outbuf) + 1, 0);
if (rc == -1) {
if (rc == -1)
{
close(client_sock);
errExit("send");
}
@@ -78,7 +101,8 @@ void session(int client_sock, struct sockaddr_un server_sockaddr, struct sockadd
exit(0);
}
int main(void){
int main(void)
{
int server_sock, client_sock, rc;
socklen_t len;
@@ -98,43 +122,49 @@ int main(void){
memset(&client_sockaddr, 0, sizeof(struct sockaddr_un));
server_sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (server_sock == -1) errExit("socket");
if (server_sock == -1)
errExit("socket");
server_sockaddr.sun_family = AF_UNIX;
strcpy(server_sockaddr.sun_path, SOCK_PATH);
unlink(SOCK_PATH);
rc = bind(server_sock, (struct sockaddr *)&server_sockaddr, len);
if (rc == -1){
if (rc == -1)
{
close(server_sock);
errExit("bind");
}
rc = listen(server_sock, backlog);
if (rc == -1){
if (rc == -1)
{
close(server_sock);
errExit("listen");
}
printf("socket listening...\n");
do {
do
{
client_sock = accept(server_sock, (struct sockaddr *)&client_sockaddr, &len);
if (client_sock == -1){
if (client_sock == -1)
{
close(server_sock);
close(client_sock);
errExit("accept");
}
if ((pid = fork()) == -1 ) {
if ((pid = fork()) == -1)
{
close(server_sock);
close(client_sock);
errExit("fork");
}
if (pid == 0) session(client_sock,server_sockaddr,client_sockaddr);
if (pid == 0)
session(client_sock, server_sockaddr, client_sockaddr);
close(client_sock);
} while (1);
close(server_sock);
unlink(SOCK_PATH);