From 19650bae5d0de65a5773f457e4f86cddf101a934 Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Thu, 14 Dec 2017 19:57:27 +0000
Subject: [PATCH 1/2] towards setnet-0.4
---
setnet.sh | 103 ++++++++++++++++++++++++++++++++++--------------------
setnetrc | 15 ++++++++
2 files changed, 80 insertions(+), 38 deletions(-)
diff --git a/setnet.sh b/setnet.sh
index 50eed6d..23dd7d5 100755
--- a/setnet.sh
+++ b/setnet.sh
@@ -29,11 +29,14 @@
## Initialisation
##
-VERSION=0.3.2
+VERSION=0.4
TOPSTR="setnet-${VERSION} [user: $(id -run)]"
DIALOG="dialog --backtitle \"${TOPSTR}\" --clear "
+DIALOG_EXTRA="dialog --backtitle \"${TOPSTR}\" --clear --extra-button --extra-label 'Quit' "
+
+
###############################
@@ -538,7 +541,7 @@ ${DEV_GW}\nDNS1: ${DEV_DNS1}\nDNS2: ${DEV_DNS2}'\
if [ -n "${DEV_DNS2}" ]; then
echo "nameserver ${DEV_DNS2}" >> /etc/resolv.conf
fi
- show_device_conf "${DEVNAME}"
+ [ -z "${SUPPRESS}" ] && show_device_conf "${DEVNAME}"
#fi
}
@@ -556,7 +559,7 @@ config_ip_dhcp(){
if [ $! -ne 0 ];then
log "config_ip_dhcp" "dhclient aborted"
fi
- show_device_conf ${DEVNAME}
+ [ -z "${SUPPRESS}" ] && show_device_conf ${DEVNAME}
}
@@ -566,7 +569,7 @@ configure_ip_address(){
##local
DEVNAME=$1
- eval "${DIALOG} --cancel-label 'Up' \
+ eval "${DIALOG} --cancel-label 'Up' \
--menu 'Configuring ${DEVNAME}' ${INFO_HEIGHT} ${INFO_WIDTH} 4 \
'DHCP' ''\
'Static' ''" 2>${TMPFILE}
@@ -592,8 +595,8 @@ wifi_essid_from_mac(){
##local
W_MAC=$2
- W_ESSID=$(wpa_cli -i "${DEVNAME}" scan_results | grep -E "^${W_MAC}" | \
- sed -r -e 's/\t/\|/g' | cut -d "|" -f 5)
+ W_ESSID="$(wpa_cli -i "${DEVNAME}" scan_results | grep -E "^${W_MAC}" | \
+ sed -r -e 's/\t/\|/g' | cut -d "|" -f 5)"
log "wifi_essid_from_mac" "Recovered ESSID: ${W_ESSID}"
}
@@ -1013,7 +1016,7 @@ wifi_authenticate(){
log "wifi_authenticate" "Trying open (no WPA) configuration..."
- wifi_authenticate_NONE ${DEVNAME} ${W_ESSID}
+ wifi_authenticate_NONE "${DEVNAME}" "${W_ESSID}"
if [ $? = "0" ]; then
log "wifi_authenticate" "Open connection configured"
return 0
@@ -1363,7 +1366,7 @@ show_device_menu(){
while true; do
DEV_STATUS=$(ip -o link | cut -d " " -f 2,9 | grep -E "^${DEVNAME}: " | cut -d " " -f 2)
log "show_device_menu" "DEVNAME: ${DEVNAME} DEV_STATUS: ${DEV_STATUS}"
- eval "${DIALOG} --cancel-label 'Up' --menu\
+ eval "${DIALOG_EXTRA} --cancel-label 'Up' --menu\
'Device: ${DEVNAME}\nStatus: ${DEV_STATUS}' \
${WINDOW_HEIGHT} ${WINDOW_WIDTH} 8 \
'View' 'View current configuration' \
@@ -1372,10 +1375,12 @@ show_device_menu(){
'Start' 'Bring interface up' \
'Stop' 'Put interface down' \
'Restart' 'Restart interface'" 2> ${TMPFILE}
-
- if [ $? -eq 1 ]; then
- return
- fi
+ ext=$?
+ if [ $ext -eq 1 ]; then
+ return
+ elif [ $ext -eq 3 ]; then
+ exit 0
+ fi
DEV_ACTION=$(cat ${TMPFILE})
case ${DEV_ACTION} in
@@ -1417,12 +1422,12 @@ show_devs() {
DEVICE_TAGS=""
for i in $DEVICES; do
- if [ "$i" != "lo" ]; then
+ if [ "$i" != "lo" -o -n "${SHOW_LO}" ]; then
DEVICE_TAGS="${DEVICE_TAGS} $i $i"
fi
done
- eval "${DIALOG} --cancel-label 'Up' \
+ eval "${DIALOG_EXTRA} --cancel-label 'Up' \
--menu 'Select Interface to configure' ${WINDOW_HEIGHT} ${WINDOW_WIDTH} 4 \
${DEVICE_TAGS}" 2> ${TMPFILE}
return $?
@@ -1432,14 +1437,17 @@ show_devs() {
##function
dev_config_menu(){
- while true; do
- show_devs
- if [ $? -eq 1 ]; then
- return
- fi
- DEVNAME=$(cat ${TMPFILE})
- show_device_menu ${DEVNAME}
- done
+ while true; do
+ show_devs
+ ext=$?
+ if [ ${ext} -eq 1 ]; then
+ return
+ elif [ ${ext} -eq 3 ]; then
+ exit 0
+ fi
+ DEVNAME=$(cat ${TMPFILE})
+ show_device_menu ${DEVNAME}
+ done
}
##function
@@ -1990,6 +1998,7 @@ SCRIPTNAME=$1
echo "Usage: ${SCRIPTNAME} [OPTION]"
echo "Options:"
printf "\t -c cfg_file\tLoad configuration from cfg_file.\n"
+ printf "\t -c trace_file\tDump dialog debug trace to trace_file.\n"
printf "\t -v\t\tPrint version number and exit.\n"
printf "\t -h\t\tShow this help.\n"
@@ -2082,6 +2091,24 @@ initialise(){
log "initialise" "SUDO_UID: ${SUDO_UID}"
log "initialise" "SUP_UID: ${SUP_UID}"
log "initialise" "USING_SUDO: ${USING_SUDO}"
+
+ SUPPRESS=""
+ if [ -n "${SUPPRESS_INFO}" ] &&
+ [ "${SUPPRESS_INFO}" != "no" ] &&
+ [ "${SUPPRESS_INFO}" != "NO" ]; then
+ SUPPRESS="1"
+ fi
+
+ if [ -n "${SHOW_LO}" ] &&
+ [ "${SHOW_LO}" != "no" ] &&
+ [ "${SHOW_LO}" != "NO" ]; then
+ SHOW_LO="1"
+ else
+ SHOW_LO=""
+ fi
+
+ log "initialise" "SUPPRESS: ${SUPPRESS}"
+
}
@@ -2097,8 +2124,9 @@ log_show(){
##function
main(){
-
- show_disclaimer
+ log "main" "SUPPRESS: ${SUPPRESS}"
+
+ [ -z "${SUPPRESS}" ] && show_disclaimer
SETNETRC=$(realpath ${SETNETRC})
log "main" "Using config file \"${SETNETRC}\""
@@ -2119,23 +2147,22 @@ main(){
log "main" "ACTION: ${ACTION}"
case ${ACTION} in
"Setup")
- dev_config_menu
- ;;
- "Info")
- netdiag_menu
- ;;
- "Dump")
- dump_menu
- ;;
- "Log")
- log_show
- ;;
+ dev_config_menu
+ ;;
+ "Info")
+ netdiag_menu
+ ;;
+ "Dump")
+ dump_menu
+ ;;
+ "Log")
+ log_show
+ ;;
"About")
- about_menu
- ;;
+ about_menu
+ ;;
esac
done
-
}
diff --git a/setnetrc b/setnetrc
index 78cc985..5bb703b 100644
--- a/setnetrc
+++ b/setnetrc
@@ -26,3 +26,18 @@ TRUNCATE_LOG="yes"
##
##WIFI_DEVICES="wlan1 wlan4"
+
+
+##
+## SUPPRESS_INFO: if set to "yes", avoid to show information panels
+## after certain configuration steps
+##
+SUPPRESS_INFO="yes"
+
+
+##
+## SHOW_LO: whether we should show loopback devices in the device list
+##
+
+SHOW_LO="yes"
+
From a140e81f3789ad20bc7872f796a0f45ebe584ffa Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Thu, 3 May 2018 12:32:57 +0100
Subject: [PATCH 2/2] Version 0.4
---
ChangeLog | 14 ++++++++++++--
debian/changelog | 6 ++++++
setnet.8 | 18 +++++++++++++++---
setnet.8.gz | Bin 3037 -> 3219 bytes
setnet.sh | 19 +++++++++++--------
5 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 18e95e6..a298e90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-05-03 KatolaZ <katolaz@freaknet.org>
+
+ * setnet.sh: fixed a bug in essid management
+ * added "EXIT" button in deep windows
+ * added config option "SUPPRESS_INFO" to remove useless
+ notifications
+ * added config option "SHOW_LO" to hide loopback devices
+ * Renamed fields in wifi cert configuration
+ * Updated manpage
+
2017-03-08 KatolaZ <katolaz@freaknet.org>
* setnet.sh (wifi_restart_wpa): Corrected a bug in the restart of
@@ -10,7 +20,7 @@
2017-01-29 KatolaZ <katolaz@freaknet.org>
* setnet.sh:
- * removed "Load file" and "New File" in WiFi configuration
+ * removed "Load file" and "New File" in WiFi configuration
2017-01-23 KatolaZ <katolaz@freaknet.org>
@@ -26,7 +36,7 @@
* all direct commands (e.g., ip, wpa_cli) are now checked
* added support for EAP/PEAP
* added support for EAP/TLS
-
+
2017-01-07 KatolaZ <katolaz@freaknet.org>
diff --git a/debian/changelog b/debian/changelog
index 0f01ce8..5d2b99f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+setnet (0.4+devuan1) unstable; urgency=medium
+
+ * new upstream version -- several fixes
+
+ -- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Thu, 03 May 2018 12:39:33 +0100
+
setnet (0.3.2+devuan1.2) unstable; urgency=medium
[ KatolaZ ]
diff --git a/setnet.8 b/setnet.8
index 7be6108..da4c1a8 100644
--- a/setnet.8
+++ b/setnet.8
@@ -1,5 +1,5 @@
.\" The following requests are required for all man pages.
-.Dd January 06, 2017
+.Dd May 03, 2018
.Dt SETNET 8 SMM
.Os Linux
.Sh NAME
@@ -33,6 +33,13 @@ active TCP/IP connections, running daemons, etc., and to dump those
information to a file. Support for posting a dump of network status to
websites like pastebin.com is under development.
+.Pp
+setnet.sh uses
+.Em /bin/sh
+by default. It has been tested with several standard shells, including
+bash, busybox, dash, ksh, mksh, posh, sh, yash, and zsh but it should work
+correctly with any POSIX-compliant shell.
+
.Pp
setnet.sh recognises the following options:
@@ -145,6 +152,11 @@ setnet.sh starts.
.It Ev WIFI_DEVICES
List of wifi devices. This list is used only when automatic detection
of wifi devices fails.
+.It Ev SUPPRESS_INFO
+If set to "yes" or "YES", setnet will suppress verbose notifications.
+.It Ev SHOW_LO
+If set to "yes" or "YES" setnet will include the loopback device in
+the list of available network devices.
.El
These variables are normally set in the setnetrc configuration file
@@ -193,14 +205,14 @@ exists, it takes precedence over
.\" fprintf/stderr type diagnostics)
.\" .Sh DIAGNOSTICS
.Sh SEE ALSO
-ip(8), dhclient(8), wpa_supplicant(8), wpa_cli(8), netstat(8).
+ip(8), iw(8), dhclient(8), wpa_supplicant(8), wpa_cli(8), netstat(8).
.\" .Sh CONFORMING TO
.\" .Sh HISTORY
.Sh AUTHORS
setnet.sh is Free Software, distributed under the terms of the GNU
General Public License (GPL), version 3 of the License.
.Pp
-setnet.sh is copyleft (c) by
+setnet.sh is copyleft (c) 2016-2018 by
.An Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org>
.Sh BUGS
diff --git a/setnet.8.gz b/setnet.8.gz
index 247c3031f4e78a33c8db534f2130e7ad807e6c86..8685692d63bb86b166698456f560337521a81376 100644
GIT binary patch
literal 3219
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
F004t`N=pC$
literal 3037
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
diff --git a/setnet.sh b/setnet.sh
index 23dd7d5..d6fc086 100755
--- a/setnet.sh
+++ b/setnet.sh
@@ -20,7 +20,7 @@
# ----------------------------------------------------------------------
#
# Copyleft (C) Vincenzo "KatolaZ" Nicosia (katolaz@freaknet.org) --
-# (2016, 2017)
+# (2016-2018)
#
#
@@ -1465,16 +1465,19 @@ Ethernet/Wi-Fi interfaces.
Both Static and DHCP-based IP configuration are supported.
-At the moment, only WPA-PSK and open (no key) Wi-Fi connections are
-available.
+Setnet supports the configuration of open (no-key), WPA-Personal
+(WPA-PSK and WPA2-PSK) and WPA-Enterprise (EAP/PEAP and EPA/TLS) Wi-Fi
+connections.
For more information, please visit the webpage of the project:
http://kalos.mine.nu/setnet/
+or, better, RTFM.
+
Please report bugs at:
- https://git.devuan.org/KatolaZ/setnet
+ https://git.devuan.org/devuan-packages/setnet
EOF
eval "${DIALOG} --cr-wrap --textbox ${TMPFILE} ${WINDOW_HEIGHT} ${WINDOW_WIDTH}"
@@ -1491,7 +1494,7 @@ show_copyright(){
--------------------------------------------------------------------
Copyleft (C) Vincenzo "KatolaZ" Nicosia <katolaz@freaknet.org>
- 2016, 2017
+ 2016-2018
--------------------------------------------------------------------
@@ -1525,7 +1528,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------
Copyleft (C) Vincenzo "KatolaZ" Nicosia <katolaz@freaknet.org>
- 2016, 2017
+ 2016-2018
--------------------------------------------------------------------
@@ -2010,7 +2013,7 @@ show_version(){
##local
SCRIPTNAME=$1
echo "${SCRIPTNAME} -- version ${VERSION}"
- echo "Copyleft (C) Vincenzo \"KatolaZ\" Nicosia (katolaz@freaknet.org) -- 2016, 2017"
+ echo "Copyleft (C) Vincenzo \"KatolaZ\" Nicosia (katolaz@freaknet.org) -- 2016-2018"
echo "This is free software. You can use and redistribute it under the "
echo "terms of the GNU General Public Licence version 3 or (at your option)"
echo "any later version."
@@ -2028,7 +2031,7 @@ show_disclaimer(){
-+- setnet.sh ${VERSION} -+-
Copyleft (C) KatolaZ (katolaz@freaknet.org)
- 2016, 2017
+ 2016-2018
-+- This is a beta release of setnet.sh -+-