lwNBD: use official repository

Author: bignaux

.clang-format-ignore

@@ -1,3 +1,2 @@
-./modules/network/lwnbdsvr/nbd-protocol.h
 ./modules/isofs/lz4.c
 ./modules/isofs/lz4.h

.gitignore

@@ -41,6 +41,11 @@ DETAILED_CHANGELOG
 pc/iso2usbld/bin/iso2usbld
 IOPRP_img.c
 
+#
+# 3rd party
+#
+*modules/network/lwNBD/
+
 # language
 lng/lang_*.lng
 *lng_src

Makefile

@@ -205,11 +205,11 @@ EE_DEPS = $($(filter %.o,$(EE_OBJS)):%.o=%.d)
 
 .SILENT:
 
-.PHONY: all release debug iopcore_debug eesio_debug ingame_debug deci2_debug clean rebuild pc_tools pc_tools_win32 oplversion format format-check ps2sdk-not-setup download_lng languages
+.PHONY: all release debug iopcore_debug eesio_debug ingame_debug deci2_debug clean rebuild pc_tools pc_tools_win32 oplversion format format-check ps2sdk-not-setup download_lng download_lwNBD languages
 
 ifdef PS2SDK
 
-all: download_lng languages
+all: download_lng download_lwNBD languages
 	echo "Building Open PS2 Loader $(OPL_VERSION)..."
 	echo "-Interface"
 ifneq ($(NOT_PACKED),1)
@@ -218,7 +218,7 @@ else
 	$(MAKE) $(EE_BIN)
 endif
 
-release: download_lng languages $(EE_VPKD).ZIP
+release: download_lng download_lwNBD languages $(EE_VPKD).ZIP
 
 debug:
 	$(MAKE) DEBUG=1 all
@@ -235,7 +235,7 @@ ingame_debug:
 deci2_debug:
 	$(MAKE) DEBUG=1 INGAME_DEBUG=1 DECI2_DEBUG=1 all
 
-clean:
+clean:	download_lwNBD
 	echo "Cleaning..."
 	echo "-Interface"
 	rm -fr $(MAPFILE) $(EE_BIN) $(EE_BIN_PACKED) $(EE_BIN_STRIPPED) $(EE_VPKD).* $(EE_OBJS_DIR) $(EE_ASM_DIR)
@@ -287,7 +287,7 @@ clean:
 	echo " -genvmc"
 	$(MAKE) -C modules/vmc/genvmc clean
 	echo " -lwnbdsvr"
-	$(MAKE) -C modules/network/lwnbdsvr clean
+	$(MAKE) -C modules/network/lwNBD/ TARGET=iop clean
 	echo " -udptty-ingame"
 	$(MAKE) -C modules/debug/udptty-ingame clean
 	echo " -ps2link"
@@ -607,10 +607,10 @@ modules/vmc/genvmc/genvmc.irx: modules/vmc/genvmc
 $(EE_ASM_DIR)genvmc.s: modules/vmc/genvmc/genvmc.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ genvmc_irx
 
-modules/network/lwnbdsvr/lwnbdsvr.irx: modules/network/lwnbdsvr
-	$(MAKE) -C $<
+modules/network/lwNBD/lwnbdsvr.irx: modules/network/lwNBD
+	$(MAKE) TARGET=iop -C $<
 
-$(EE_ASM_DIR)lwnbdsvr.s: modules/network/lwnbdsvr/lwnbdsvr.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)lwnbdsvr.s: modules/network/lwNBD/lwnbdsvr.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ lwnbdsvr_irx
 
 $(EE_ASM_DIR)udptty.s: $(PS2SDK)/iop/irx/udptty.irx | $(EE_ASM_DIR)
@@ -743,6 +743,9 @@ languages: $(ENGLISH_TEMPLATE_YML) $(TRANSLATIONS_YML) $(ENGLISH_LNG) $(TRANSLAT
 download_lng:
 	./download_lng.sh
 
+download_lwNBD:
+	./download_lwNBD.sh
+
 $(TRANSLATIONS_LNG): $(LNG_DIR)lang_%.lng: $(LNG_SRC_DIR)%.yml $(BASE_LANGUAGE) $(LANG_COMPILER)
 	python3 $(LANG_COMPILER) --make_lng --base $(BASE_LANGUAGE) --translation $< $@
 

download_lwNBD.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+## Download lwNBD
+REPO_URL="https://github.com/bignaux/lwNBD.git"
+REPO_FOLDER="modules/network/lwNBD"
+COMMIT="9777a10f840679ef89b1ec6a588e2d93803d7c37"
+if test ! -d "$REPO_FOLDER"; then
+  git clone $REPO_URL "$REPO_FOLDER" || { exit 1; }
+  (cd $REPO_FOLDER && git checkout "$COMMIT" && cd -) || { exit 1; }
+else
+  (cd "$REPO_FOLDER" && git fetch origin && git checkout "$COMMIT" && cd - )|| exit 1
+fi

labs/lwnbdsvr/Makefile

@@ -19,7 +19,7 @@ clean:
 	$(MAKE) -C ../../modules/network/SMSMAP clean
 	$(MAKE) -C ../../modules/hdd/atad clean
 	$(MAKE) -C ../../modules/hdd/ps2hdd clean
-	$(MAKE) -C ../../modules/network/lwnbdsvr clean
+	$(MAKE) -C ../../modules/network/lwNBD clean
 	rm -f *.elf *.o *.a *.s
 
 rebuild: clean all
@@ -56,8 +56,8 @@ ps2hdd.s:
 	$(BIN2S) ../../modules/hdd/ps2hdd/ps2hdd.irx ps2hdd.s ps2hdd_irx
 
 lwnbdsvr.s:
-	$(MAKE) -C ../../modules/network/lwnbdsvr
-	$(BIN2S) ../../modules/network/lwnbdsvr/lwnbdsvr.irx lwnbdsvr.s lwnbdsvr_irx
+	$(MAKE) -C ../../modules/network/lwNBD
+	$(BIN2S) ../../modules/network/lwNBD/lwnbdsvr.irx lwnbdsvr.s lwnbdsvr_irx
 
 iomanx.s:
 	$(BIN2S) $(PS2SDK)/iop/irx/iomanX.irx iomanx.s iomanx_irx

modules/network/lwnbdsvr/LICENSE

@@ -214,8 +214,7 @@ static void menuInitMainMenu(void)
     submenuAppendItem(&mainMenu, -1, NULL, MENU_PARENTAL_LOCK, _STR_PARENLOCKCONFIG);
     submenuAppendItem(&mainMenu, -1, NULL, MENU_NET_CONFIG, _STR_NETCONFIG);
     submenuAppendItem(&mainMenu, -1, NULL, MENU_NET_UPDATE, _STR_NET_UPDATE);
-    if (gHDDStartMode && gEnableWrite) // enabled at all?
-        submenuAppendItem(&mainMenu, -1, NULL, MENU_START_NBD, _STR_STARTNBD);
+    submenuAppendItem(&mainMenu, -1, NULL, MENU_START_NBD, _STR_STARTNBD);
     submenuAppendItem(&mainMenu, -1, NULL, MENU_ABOUT, _STR_ABOUT);
     submenuAppendItem(&mainMenu, -1, NULL, MENU_SAVE_CHANGES, _STR_SAVE_CHANGES);
     submenuAppendItem(&mainMenu, -1, NULL, MENU_EXIT, _STR_EXIT);

modules/network/lwnbdsvr/Makefile

@@ -1414,9 +1414,17 @@ int oplUpdateGameCompatSingle(int id, item_list_t *support, config_set_t *config
 // ----------------------------------------------------------
 // -------------------- NBD SRV Support ---------------------
 // ----------------------------------------------------------
+
+
 static int loadLwnbdSvr(void)
 {
     int ret, padStatus;
+    struct lwnbd_config
+    {
+        char defaultexport[32];
+        uint8_t readonly;
+    };
+    struct lwnbd_config config;
 
     // deint audio lib while nbd server is running
     audioEnd();
@@ -1433,11 +1441,21 @@ static int loadLwnbdSvr(void)
     unloadPads();
     // sysReset(0); // usefull ? printf doesn't work with it.
 
+    /* compat stuff for user not providing name export (useless when there was only one export) */
+    ret = strlen(gExportName);
+    if (ret == 0)
+        strcpy(config.defaultexport, "hdd0");
+    else
+        strcpy(config.defaultexport, gExportName);
+
+    config.readonly = !gEnableWrite;
+
+    // see gETHStartMode, gNetworkStartup ? this is slow, so if we don't have to do it (like debug build).
     ret = ethLoadInitModules();
     if (ret == 0) {
-        ret = sysLoadModuleBuffer(&ps2atad_irx, size_ps2atad_irx, 0, NULL);
+        ret = sysLoadModuleBuffer(&ps2atad_irx, size_ps2atad_irx, 0, NULL); /* gHDDStartMode ? */
         if (ret >= 0) {
-            ret = sysLoadModuleBuffer(&lwnbdsvr_irx, size_lwnbdsvr_irx, 4, (char *)&gExportName);
+            ret = sysLoadModuleBuffer(&lwnbdsvr_irx, size_lwnbdsvr_irx, sizeof(config), (char *)&config);
             if (ret >= 0)
                 ret = 0;
         }
@@ -1490,8 +1508,7 @@ void handleLwnbdSrv()
     // prepare for lwnbd, display screen with info
     guiRenderTextScreen(_l(_STR_STARTINGNBD));
     if (loadLwnbdSvr() == 0) {
-        snprintf(temp, sizeof(temp), "%s IP: %d.%d.%d.%d %s", _l(_STR_RUNNINGNBD),
-                 ps2_ip[0], ps2_ip[1], ps2_ip[2], ps2_ip[3], ps2_ip_use_dhcp ? "DHCP" : "");
+        snprintf(temp, sizeof(temp), "%s", _l(_STR_RUNNINGNBD));
         guiMsgBox(temp, 0, NULL);
     } else
         guiMsgBox(_l(_STR_STARTFAILNBD), 0, NULL);