From 67466ade6ea6aed78d0c09215161a703a0b8f056 Mon Sep 17 00:00:00 2001 From: Rockingcool Date: Wed, 5 Apr 2023 08:13:05 -0500 Subject: [PATCH] Continued working on retrieving IP address from message --- main.c | 8 ++++++++ message_helpers.c | 12 +++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 20735b4..083de6b 100644 --- a/main.c +++ b/main.c @@ -66,6 +66,14 @@ int main() { } else { if (dest_address[i] == NULL) { dest_address[i] = fetch_address(buffer); + if (dest_address[i] == NULL) { + printf("Invalid message format\n"); + exit(241); + } + if (check_ip_ver(dest_address[i]) == -1) { + printf("Invalid address: %s\n",dest_address[i]); + exit(242); + } } diff --git a/message_helpers.c b/message_helpers.c index 41b457b..dfcd2f8 100644 --- a/message_helpers.c +++ b/message_helpers.c @@ -4,14 +4,12 @@ char* fetch_address(char* message) { char* token = malloc (sizeof(char) * strlen(message)); - token = strtok(message," "); + token = strtok(message," \n"); if (strcmp(token,"TO:") == 0) { - token = strtok(NULL,""); - } - - if (check_ip_ver(token) == -1) { - return NULL; + token = strtok(NULL," \n"); } else { - return token; + return NULL; } + + return token; }