yo/mynettcptable
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

go fmt

Browse Source
This commit is contained in:
yo 2022-05-13 10:42:47 +02:00
parent 3267a19888
commit b9807f0ba7
1 changed files with 45 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mynettcptable.go
View File

@ -7,22 +7,22 @@
package main package main
import ( import (
"os"
"fmt" "fmt"
"net" "net"
"os"
// "log" // "log"
"errors"
"flag" "flag"
"log/syslog"
"strings"
"sync" "sync"
"time" "time"
"errors"
"strings"
"log/syslog"
"github.com/tabalt/pidfile"
"github.com/go-ldap/ldap/v3" "github.com/go-ldap/ldap/v3"
"github.com/peterbourgon/ff" "github.com/peterbourgon/ff"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
lSyslog "github.com/sirupsen/logrus/hooks/syslog" lSyslog "github.com/sirupsen/logrus/hooks/syslog"
"github.com/tabalt/pidfile"
) )
const ( const (
@ -95,7 +95,6 @@ func unsetNetCachePresentFlag() {
} }
} }
func buildNetCacheFromIPNetwork(conLdap *ldap.Conn) error { func buildNetCacheFromIPNetwork(conLdap *ldap.Conn) error {
attribute := "ipNetworkNumber" attribute := "ipNetworkNumber"
@ -117,10 +116,6 @@ func buildNetCacheFromIPNetwork(conLdap *ldap.Conn) error {
logstream.Info(fmt.Sprintf("Error searching into LDAP: Attribute %s not found for entry %s\n", attribute, r)) logstream.Info(fmt.Sprintf("Error searching into LDAP: Attribute %s not found for entry %s\n", attribute, r))
continue continue
} else { } else {
// Explode the network to individual IPs
// 1: Verify format : Either CIDR, or netmask is in ipNetworkMask (do we want to support this?)
// 2: n := iplib.NewNet4(net.ParseIP("192.168.0.0"), 16)
// n.Enumerate(
_, ipnet, err := net.ParseCIDR(r.Attributes[0].Values[0]) _, ipnet, err := net.ParseCIDR(r.Attributes[0].Values[0])
if err != nil { if err != nil {
logstream.Info(err.Error()) logstream.Info(err.Error())
@ -143,7 +138,6 @@ func buildNetCacheFromIPNetwork(conLdap *ldap.Conn) error {
return nil return nil
} }
func isIPContainedInNetCache(string_ip string) (bool, error) { func isIPContainedInNetCache(string_ip string) (bool, error) {
ip := net.ParseIP(string_ip) ip := net.ParseIP(string_ip)
if ip == nil { if ip == nil {
@ -391,7 +385,7 @@ func main() {
if strings.EqualFold(*logTo, "syslog") { if strings.EqualFold(*logTo, "syslog") {
// level != priority // level != priority
prio := syslog.LOG_MAIL prio := syslog.LOG_MAIL
switch (*logLevel) { switch *logLevel {
case "fatal": case "fatal":
prio += syslog.LOG_CRIT prio += syslog.LOG_CRIT
case "error": case "error":
@ -422,4 +416,3 @@ func main() {
logstream.Infof("Start listening for incoming connections on %s\n", *listen) logstream.Infof("Start listening for incoming connections on %s\n", *listen)
run() run()
} }