From d6d3a18e044367063c74a7a9dd8dd2124c6e2715 Mon Sep 17 00:00:00 2001
From: bolvan <k@vodka.home.kg>
Date: Wed, 17 Apr 2019 16:26:43 +0300
Subject: [PATCH] get_user fix & optimization

---
 ipset/def.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ipset/def.sh b/ipset/def.sh
index e016d7c..11d3fcd 100755
--- a/ipset/def.sh
+++ b/ipset/def.sh
@@ -23,19 +23,19 @@ digger()
  fi
 }
 
-getuser()
-{
- for f in $ZUSERLIST $ZUSERLIST_IPBAN
- do
-  [ -f $f ] && {
-   digger $f | grep -E '^[^;].*[^.]$' | grep -vE '^192\.168\.[0-9]+.[0-9]+$' | grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' | grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u >$ZIPLIST_USER
-  }
- done
-}
-
 cut_local()
 {
   grep -vE '^192\.168\.[0-9]+\.[0-9]+$' |
   grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' |
   grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$'
 }
+
+getuser()
+{
+ [ -f $ZUSERLIST ] && {
+  digger $ZUSERLIST | cut_local | sort -u >$ZIPLIST_USER
+ }
+ [ -f $ZUSERLIST_IPBAN ] && {
+  digger $ZUSERLIST_IPBAN | cut_local | sort -u >$ZIPLIST_USER_IPBAN
+ }
+}