diff -Nur common.orig/current/ChangeLog common/current/ChangeLog --- common.orig/current/ChangeLog Thu Jul 31 17:56:26 2003 +++ common/current/ChangeLog Mon Aug 4 13:02:11 2003 @@ -1,3 +1,8 @@ +2003-08-04 Motoya Kurotsu + + * tests/tftp_server_test.c (tftp_test): Negative serverX_id + is possible. serverX_id means failure when it is equal to zero. + 2003-07-29 Motoya Kurotsu * src/dhcp_prot.c (do_dhcp): (re)Initialize the lease when diff -Nur common.orig/current/tests/tftp_server_test.c common/current/tests/tftp_server_test.c --- common.orig/current/tests/tftp_server_test.c Wed Apr 23 17:52:09 2003 +++ common/current/tests/tftp_server_test.c Mon Aug 4 12:40:01 2003 @@ -89,7 +89,7 @@ extern struct tftpd_fileops dummy_fileops; server1_id = tftpd_start(0, &dummy_fileops); - if (server1_id > 0) { + if (server1_id != 0) { diag_printf("TFTP server created - id: %x\n", server1_id); } else { diag_printf("Couldn't create first server!\n"); @@ -97,14 +97,14 @@ #ifdef CYGSEM_NET_TFTPD_MULTITHREADED server2_id = tftpd_start(0, &dummy_fileops); - if (server2_id > 0) { + if (server2_id != 0) { diag_printf("Second TFTP server created - id: %x\n", server2_id); } else { diag_printf("Couldn't create a second server!\n"); } #if CYGNUM_NET_TFTPD_MULTITHREADED_PORTS > 1 server3_id = tftpd_start(1025, &dummy_fileops); - if (server3_id > 0) { + if (server3_id != 0) { diag_printf("Third TFTP server created - id: %x\n", server3_id); } else { diag_printf("Couldn't create a third server!\n"); @@ -112,7 +112,7 @@ #endif //CYGNUM_NET_TFTPD_MULTITHREADED_PORTS > 1 #else //CYGSEM_NET_TFTPD_MULTITHREADED server2_id = tftpd_start(1025, &dummy_fileops); - if (server2_id > 0) { + if (server2_id != 0) { diag_printf("Second TFTP server created - id: %x\n", server2_id); } else { diag_printf("Couldn't create a second server!\n"); @@ -125,15 +125,15 @@ cyg_thread_delay(5*60*100); TNR_OFF(); - if (server1_id > 0) { + if (server1_id != 0) { res = tftpd_stop(server1_id); diag_printf("TFTP server - id: %x stopped - res: %d\n", server1_id, res); } - if (server2_id > 0) { + if (server2_id != 0) { res = tftpd_stop(server2_id); diag_printf("TFTP server - id: %x stopped - res: %d\n", server2_id, res); } - if (server3_id > 0) { + if (server3_id != 0) { res = tftpd_stop(server2_id); diag_printf("TFTP server - id: %x stopped - res: %d\n", server2_id, res); }