rename net_util to net_cmdline

Also create a net_core module and move the net_cmdline there since it's shared by all network commands.
dunnaway · Mar 11, 2019 · 85f3584 · 85f3584
1 parent ea336e9
commit 85f3584
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,7 @@ add_subdirectory(core)
 add_subdirectory(bbs)
 add_subdirectory(local_io)
 add_subdirectory(localui)
+add_subdirectory(net_core)
 add_subdirectory(network)
 add_subdirectory(network1)
 add_subdirectory(network2)

diff --git a/net_core/CMakeLists.txt b/net_core/CMakeLists.txt
@@ -0,0 +1,16 @@
+# CMake for WWIV 5
+include_directories(..)
+
+set(SOURCES 
+ net_cmdline.cpp
+)
+
+if(UNIX) 
+  add_definitions ("-Wall")
+endif()
+
+if(WIN32)
+    SET_WARNING_LEVEL_4()
+endif()
+
+add_library(net_core ${SOURCES})
diff --git a/networkb/net_util.cpp → net_core/net_cmdline.cpp b/networkb/net_util.cpp → net_core/net_cmdline.cpp
@@ -15,7 +15,7 @@
 /*    either  express  or implied.  See  the  License for  the specific   */
 /*    language governing permissions and limitations under the License.   */
 /**************************************************************************/
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 
 #include <string>
 

diff --git a/networkb/net_util.h → net_core/net_cmdline.h b/networkb/net_util.h → net_core/net_cmdline.h
diff --git a/net_core_test/CMakeLists.txt b/net_core_test/CMakeLists.txt
@@ -0,0 +1,13 @@
+enable_testing()
+
+include_directories(../deps/googletest/googletest/include)
+include_directories(..)
+
+set(test_sources
+  net_cmdline_test.cpp
+)
+
+add_executable(net_core_tests ${test_sources})
+target_link_libraries(net_core_tests net_core core_fixtures gtest sdk)
+
+add_test(net_core_tests net_core_tests)
diff --git a/networkb_test/net_util_test.cpp → net_core_test/net_cmdline_test.cpp b/networkb_test/net_util_test.cpp → net_core_test/net_cmdline_test.cpp
@@ -18,7 +18,7 @@
 #include "gtest/gtest.h"
 #include "core/strings.h"
 #include "core_test/file_helper.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 
 #include <cstdint>
 #include <string>

diff --git a/network/CMakeLists.txt b/network/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(..)
 set(NETWORK_MAIN network.cpp)
 
 add_executable(network ${NETWORK_MAIN})
-target_link_libraries(network networkb_lib core sdk)
+target_link_libraries(network networkb_lib net_core core sdk)
 
diff --git a/network/network.cpp b/network/network.cpp
@@ -33,10 +33,9 @@
 #include "core/stl.h"
 #include "core/strings.h"
 #include "core/os.h"
-#include "networkb/binkp.h"
 #include "networkb/binkp_config.h"
 #include "core/connection.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "networkb/ppp_config.h"
 
 #include "sdk/config.h"

diff --git a/network1/CMakeLists.txt b/network1/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(..)
 set(NETWORK_MAIN network1.cpp)
 
 add_executable(network1 ${NETWORK_MAIN})
-target_link_libraries(network1 networkb_lib core sdk)
+target_link_libraries(network1 networkb_lib net_core core sdk)
 
diff --git a/network1/network1.cpp b/network1/network1.cpp
@@ -35,7 +35,7 @@
 #include "core/scope_exit.h"
 #include "core/stl.h"
 #include "core/strings.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
 
 #include "sdk/bbslist.h"

diff --git a/network2/CMakeLists.txt b/network2/CMakeLists.txt
@@ -9,5 +9,5 @@ set(NETWORK_MAIN
 	)
 
 add_executable(network2 ${NETWORK_MAIN})
-target_link_libraries(network2 networkb_lib core sdk)
+target_link_libraries(network2 networkb_lib net_core core sdk)
 
diff --git a/network2/email.cpp b/network2/email.cpp
@@ -38,12 +38,9 @@
 #include "core/stl.h"
 #include "core/strings.h"
 #include "core/os.h"
-#include "networkb/binkp.h"
-#include "networkb/binkp_config.h"
 #include "core/connection.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
-#include "networkb/ppp_config.h"
 #include "network2/context.h"
 
 #include "sdk/bbslist.h"

diff --git a/network2/network2.cpp b/network2/network2.cpp
@@ -39,11 +39,8 @@
 #include "core/stl.h"
 #include "core/strings.h"
 #include "core/os.h"
-#include "networkb/binkp.h"
-#include "networkb/binkp_config.h"
 #include "core/connection.h"
-#include "networkb/net_util.h"
-#include "networkb/ppp_config.h"
+#include "net_core/net_cmdline.h"
 #include "network2/context.h"
 #include "network2/email.h"
 #include "network2/post.h"

diff --git a/network2/post.cpp b/network2/post.cpp
@@ -39,11 +39,8 @@
 #include "core/stl.h"
 #include "core/strings.h"
 #include "network2/context.h"
-#include "networkb/binkp.h"
-#include "networkb/binkp_config.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
-#include "networkb/ppp_config.h"
 
 #include "sdk/bbslist.h"
 #include "sdk/callout.h"

diff --git a/network2/subs.cpp b/network2/subs.cpp
@@ -40,12 +40,9 @@
 #include "core/strings.h"
 #include "core/os.h"
 #include "core/textfile.h"
-#include "networkb/binkp.h"
-#include "networkb/binkp_config.h"
 #include "core/connection.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
-#include "networkb/ppp_config.h"
 #include "network2/context.h"
 #include "network2/email.h"
 

diff --git a/network3/CMakeLists.txt b/network3/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(..)
 set(NETWORK_MAIN network3.cpp)
 
 add_executable(network3 ${NETWORK_MAIN})
-target_link_libraries(network3 networkb_lib core sdk)
+target_link_libraries(network3 networkb_lib net_core core sdk)
 
diff --git a/network3/network3.cpp b/network3/network3.cpp
@@ -40,12 +40,10 @@
 #include "core/textfile.h"
 #include "core/version.h"
 #include "core/findfiles.h"
-#include "networkb/binkp.h"
 #include "networkb/binkp_config.h"
 #include "core/connection.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
-#include "networkb/ppp_config.h"
 
 #include "sdk/bbslist.h"
 #include "sdk/callout.h"
@@ -59,6 +57,7 @@
 #include "sdk/subxtr.h"
 #include "sdk/fido/fido_address.h"
 #include "sdk/fido/fido_callout.h"
+#include "sdk/fido/fido_util.h"
 #include "sdk/fido/nodelist.h"
 #include "sdk/net/packets.h"
 

diff --git a/networkb/CMakeLists.txt b/networkb/CMakeLists.txt
@@ -10,7 +10,6 @@ set(SOURCES
  cram.cpp
  file_manager.cpp
  net_log.cpp
- net_util.cpp
  ppp_config.cpp
  remote.cpp
  transfer_file.cpp
@@ -19,7 +18,7 @@ set(SOURCES
 
 add_library(networkb_lib ${SOURCES})
 add_executable(networkb ${NETWORKB_MAIN})
-target_link_libraries(networkb networkb_lib core sdk)
+target_link_libraries(networkb networkb_lib net_core core sdk)
 if(UNIX)
   if(CMAKE_SYSTEM_NAME MATCHES "SunOS.*")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lsocket -lnsl -lkstat -lssp")

diff --git a/networkb/binkp.h b/networkb/binkp.h
@@ -33,7 +33,7 @@
 #include "networkb/cram.h"
 #include "networkb/file_manager.h"
 #include "networkb/remote.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "networkb/receive_file.h"
 
 namespace wwiv {

diff --git a/networkb/networkb.cpp b/networkb/networkb.cpp
@@ -43,7 +43,7 @@
 #include "core/socket_exceptions.h"
 #include "networkb/binkp.h"
 #include "networkb/binkp_config.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "networkb/wfile_transfer_file.h"
 
 #include "sdk/callout.h"

diff --git a/networkb_test/CMakeLists.txt b/networkb_test/CMakeLists.txt
@@ -10,7 +10,6 @@ set(test_sources
   fake_connection.cpp
   transfer_file_test.cpp
   net_log_test.cpp
-  net_util_test.cpp
   ppp_config_test.cpp
   networkb_test_main.cpp
 )

diff --git a/networkc/CMakeLists.txt b/networkc/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(..)
 set(NETWORK_MAIN networkc.cpp)
 
 add_executable(networkc ${NETWORK_MAIN})
-target_link_libraries(networkc networkb_lib core sdk)
+target_link_libraries(networkc networkb_lib net_core core sdk)
 
diff --git a/networkc/networkc.cpp b/networkc/networkc.cpp
@@ -38,7 +38,7 @@
 #include "core/stl.h"
 #include "core/strings.h"
 #include "core/version.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/fido/fido_util.h"
 
 #include "core/datetime.h"

diff --git a/networkf/CMakeLists.txt b/networkf/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(..)
 set(NETWORK_MAIN networkf.cpp)
 
 add_executable(networkf ${NETWORK_MAIN})
-target_link_libraries(networkf networkb_lib core sdk)
+target_link_libraries(networkf networkb_lib net_core core sdk)
 
diff --git a/networkf/networkf.cpp b/networkf/networkf.cpp
@@ -42,10 +42,7 @@
 #include "core/strings.h"
 #include "core/textfile.h"
 #include "core/version.h"
-#include "networkb/binkp.h"
-#include "networkb/binkp_config.h"
-#include "networkb/net_util.h"
-#include "networkb/ppp_config.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/bbslist.h"
 #include "sdk/callout.h"
 #include "sdk/config.h"

diff --git a/sdk/net/packets.cpp b/sdk/net/packets.cpp
@@ -24,7 +24,7 @@
 #include "core/log.h"
 #include "core/strings.h"
 #include "core/version.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/filenames.h"
 #include "sdk/subscribers.h"
 

diff --git a/sdk_test/net/callouts_test.cpp b/sdk_test/net/callouts_test.cpp
@@ -18,7 +18,7 @@
 #include "core/datetime.h"
 #include "core/strings.h"
 #include "core_test/file_helper.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/callouts.h"
 #include "gtest/gtest.h"
 

diff --git a/sdk_test/net/packets_test.cpp b/sdk_test/net/packets_test.cpp
@@ -18,7 +18,7 @@
 #include "core/datetime.h"
 #include "core/strings.h"
 #include "core_test/file_helper.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
 #include "gtest/gtest.h"
 

diff --git a/wwivutil/fido/dump_fido_packet.cpp b/wwivutil/fido/dump_fido_packet.cpp
@@ -21,7 +21,7 @@
 #include "core/file.h"
 #include "core/log.h"
 #include "core/strings.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/fido/fido_packets.h"
 #include "sdk/fido/fido_util.h"
 #include "sdk/ftn_msgdupe.h"

diff --git a/wwivutil/net/dump_packet.cpp b/wwivutil/net/dump_packet.cpp
@@ -25,7 +25,7 @@
 #include "core/file.h"
 #include "core/log.h"
 #include "core/strings.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
 #include "core/datetime.h"
 #include "sdk/net.h"

diff --git a/wwivutil/net/list.cpp b/wwivutil/net/list.cpp
@@ -24,7 +24,7 @@
 #include "core/command_line.h"
 #include "core/log.h"
 #include "core/strings.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
 #include "sdk/bbslist.h"
 #include "sdk/config.h"

diff --git a/wwivutil/net/req.cpp b/wwivutil/net/req.cpp
@@ -24,7 +24,7 @@
 #include "core/command_line.h"
 #include "core/log.h"
 #include "core/strings.h"
-#include "networkb/net_util.h"
+#include "net_core/net_cmdline.h"
 #include "sdk/net/packets.h"
 #include "sdk/bbslist.h"
 #include "sdk/config.h"