Skip to content

Commit 8b330c1

Browse files
lab3: improved IP_ADDR macro
1 parent 8f873fb commit 8b330c1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

socket/client.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#define PORT 8080
88
#define MAX_BUF 1024
9+
#define IP_ADDR "192.168.64.4"
910

1011
int main(void)
1112
{
@@ -30,7 +31,7 @@ int main(void)
3031
// Set port and IP the same as server-side:
3132
server_addr.sin_family = AF_INET;
3233
server_addr.sin_port = htons(PORT);
33-
server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
34+
server_addr.sin_addr.s_addr = inet_addr(IP_ADDR);
3435

3536
// Send connection request to server:
3637
if(connect(socket_desc, (struct sockaddr*)&server_addr, sizeof(server_addr)) < 0){

socket/server.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66

77
#define PORT 8080
88
#define MAX_BUF 1024
9+
#define IP_ADDR "192.168.64.4"
910

1011
int main(void)
1112
{
12-
int socket_desc, client_sock, client_size;
13+
int socket_desc, client_sock;
14+
socklen_t client_size;
1315
struct sockaddr_in server_addr, client_addr;
1416
char server_message[MAX_BUF], client_message[MAX_BUF];
1517

@@ -29,7 +31,7 @@ int main(void)
2931
// Set port and IP:
3032
server_addr.sin_family = AF_INET;
3133
server_addr.sin_port = htons(PORT);
32-
server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
34+
server_addr.sin_addr.s_addr = inet_addr(IP_ADDR);
3335

3436
// Bind to the set port and IP:
3537
if(bind(socket_desc, (struct sockaddr*)&server_addr, sizeof(server_addr))<0){
@@ -63,7 +65,7 @@ int main(void)
6365
printf("Msg from client: %s\n", client_message);
6466

6567
// Respond to client:
66-
strcpy(server_message, "This is the server's message.");
68+
strcpy(server_message, "This is the server's message.\n");
6769

6870
if (send(client_sock, server_message, strlen(server_message), 0) < 0){
6971
printf("Can't send\n");

0 commit comments

Comments
 (0)