From 70076b0b4e838965ce3cc7090a1ba60fc5bbac52 Mon Sep 17 00:00:00 2001 From: Lennart Buhl Date: Sat, 2 Nov 2013 21:55:33 +0100 Subject: [PATCH] add cleanup_display call in case of SIGINT --- src/display.c | 2 +- src/main.c | 1 + src/net.c | 2 +- src/net.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/display.c b/src/display.c index a120639..6c3845c 100644 --- a/src/display.c +++ b/src/display.c @@ -57,7 +57,7 @@ void callback(const struct message *msg, const struct prog_info *pinfo) { //int init = 0; -//int rows; +//int rows; //int cols; void prntscreen(const struct message *msg, const struct prog_info *pinfo) { static int init = 0; diff --git a/src/main.c b/src/main.c index aec99a1..f50ded8 100644 --- a/src/main.c +++ b/src/main.c @@ -93,6 +93,7 @@ int main(int argc, char **argv) { ret = run_server(&prog_info); } else { printf("running in CLIENT mode, using client number %d\n", prog_info.client_offset); + signal(SIGINT,&cleanup_display); ret = run_client(&prog_info, callback); } diff --git a/src/net.c b/src/net.c index d005b1b..63410a1 100644 --- a/src/net.c +++ b/src/net.c @@ -152,7 +152,7 @@ int run_client(const struct prog_info *pinfo, void (*framecallback)(const struct printf("check!\n"); freeaddrinfo(servinfo); // free whole list - + struct sockaddr_storage their_addr; socklen_t addr_len = sizeof their_addr; int numbytes; diff --git a/src/net.h b/src/net.h index 69e60cd..0baf860 100644 --- a/src/net.h +++ b/src/net.h @@ -4,7 +4,7 @@ #include // struct sockaddr #include "misc.h" // prog_info #include "msg.h" // message serialization -#include "display.h" // callback +#include "display.h" // callback void *get_in_addr(struct sockaddr *sa); int run_server(const struct prog_info *pinfo);