Commit 5999eddc authored by szh's avatar szh

网口识别 增加 enp2s0 wlp3s0

parent 00826a64
...@@ -24,15 +24,11 @@ func Broadcast() { ...@@ -24,15 +24,11 @@ func Broadcast() {
serial = pai.Serial serial = pai.Serial
} }
} }
//ip 会变化 ip,err := GetRightIp()
ip, err := util.GetLocalIpByName("wlan0")
if err != nil || ip == nil {
tlog.Error("broadcast", err)
ip, err = util.GetLocalIpByName("eth0")
if err != nil { if err != nil {
panic(err) panic(err)
} }
}
// 这里设置发送者的IP地址,自己查看一下自己的IP自行设定 // 这里设置发送者的IP地址,自己查看一下自己的IP自行设定
laddr := net.UDPAddr{ laddr := net.UDPAddr{
IP: ip.IP, IP: ip.IP,
...@@ -51,16 +47,9 @@ func Broadcast() { ...@@ -51,16 +47,9 @@ func Broadcast() {
} }
for { for {
//ip 会变化 //ip 会变化
ip, err = util.GetLocalIpByName("wlan0") ip, err = GetRightIp()
if err != nil || ip == nil {
tlog.Error("broadcast", "err", "wlan0 not exists")
ip, err = util.GetLocalIpByName("eth0")
if err != nil { if err != nil {
tlog.Error("broadcast", "err", "eth0 not exists") panic(err)
time.Sleep(time.Second * 1)
continue
}
tlog.Info("broadcast", "eth0", ip.IP.String())
} }
if runningAddr != nil && runningAddr.IP.String() != ip.IP.String() { if runningAddr != nil && runningAddr.IP.String() != ip.IP.String() {
...@@ -96,3 +85,23 @@ func Broadcast() { ...@@ -96,3 +85,23 @@ func Broadcast() {
} }
} }
func GetRightIp() (ipv4 *net.IPNet, err error) {
//ip 会变化
ip, err := util.GetLocalIpByName("wlan0")
if err != nil || ip == nil {
//tlog.Error("broadcast", err)
ip, err = util.GetLocalIpByName("eth0")
if err != nil {
ip, err := util.GetLocalIpByName("wlp3s0")
if err != nil || ip == nil {
//tlog.Error("broadcast", err)
ip, err = util.GetLocalIpByName("enp2s0")
if err != nil {
panic(err)
}
}
}
}
return ip,err
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment