minieap: improve output log format

This commit is contained in:
AmadeusGhost 2021-01-08 11:28:10 +08:00
parent de1bcb45aa
commit 277801dcfd
6 changed files with 30 additions and 9 deletions

View File

View File

View File

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2011 Xmlad.com
# Copyright (C) 2016 Openwrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -13,38 +13,34 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/updateing/minieap.git
PKG_SOURCE_VERSION:=9e10f320a9fce46c8f4286324a0fc70e572f61dc
PKG_MIRROR_HASH:=41c976810c994d6125f6fe3cb1d978f7e257aa587ee32229364942a82621b273
PKG_REV=9e10f320a9fce46c8f4286324a0fc70e572f61dc
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_INSTALL:=1
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk
define Package/minieap
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libpcap
TITLE:=Extendable 802.1x client
URL:=https://github.com/updateing/minieap
SUBMENU:=Campus Network
endef
define Package/minieap/description
Extendable 802.1x client
Extendable 802.1x client with Ruijie v3 (v4) plugin.
endef
define Package/minieap/conffiles
/etc/minieap.conf
endef
define Build/Install
endef
define Package/minieap/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/minieap $(1)/usr/sbin/

View File

@ -0,0 +1,13 @@
--- a/config.mk
+++ b/config.mk
@@ -17,8 +17,8 @@ PLUGIN_MODULES += if_impl_sockraw
# PLUGIN_MODULES += ifaddrs
ENABLE_DEBUG := false
-ENABLE_ICONV := true
-ENABLE_GBCONV := false
+ENABLE_ICONV := false
+ENABLE_GBCONV := true
STATIC_BUILD := false
# If your platform has iconv_* integrated into libc, change to false

View File

@ -0,0 +1,12 @@
--- a/packet_plugin/rjv3/packet_plugin_rjv3_priv.c
+++ b/packet_plugin/rjv3/packet_plugin_rjv3_priv.c
@@ -132,7 +132,8 @@ static void rjv3_set_hdd_serial(uint8_t* serial_buf, char* fake_serial) {
memmove(serial_buf, fake_serial, strnlen(fake_serial, MAX_PROP_LEN));
return;
}
-#ifdef __linux__
+ PR_WARN("请使用 --fake-serial 选项手动指定硬盘序列号");
+#if 0
FILE* _fp = fopen("/etc/mtab", "r");
char _line_buf[MAX_LINE_LEN] = {0};
char* _line_buf_dev, *_line_buf_mountpoint;