github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap.git synced 2025-03-12 04:36:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

misc: small fix or general refactoring i did not bother commenting

Browse Source
This commit is contained in:
evilsocket 2019-03-09 12:08:19 +01:00
parent 5d7c8933fa
commit e22ce22716
No known key found for this signature in database
GPG Key ID: 1564D7F30393A456
2 changed files with 27 additions and 22 deletions
modules/gps
gps.go
session
session.go

38
modules/gps/gps.go

@ -106,21 +106,12 @@ func (mod *GPS) readLine() (line string, err error) {
}
func (mod *GPS) Show() error {
if mod.Session.GPS.GNGGA.Time.Valid {
fmt.Printf("latitude:%f longitude:%f quality:%s satellites:%d altitude:%f\n",
mod.Session.GPS.GNGGA.Latitude,
mod.Session.GPS.GNGGA.Longitude,
mod.Session.GPS.GNGGA.FixQuality,
mod.Session.GPS.GNGGA.NumSatellites,
mod.Session.GPS.GNGGA.Altitude)
} else {
fmt.Printf("latitude:%f longitude:%f quality:%s satellites:%d altitude:%f\n",
mod.Session.GPS.GPGGA.Latitude,
mod.Session.GPS.GPGGA.Longitude,
mod.Session.GPS.GPGGA.FixQuality,
mod.Session.GPS.GPGGA.NumSatellites,
mod.Session.GPS.GPGGA.Altitude)
}
fmt.Printf("latitude:%f longitude:%f quality:%s satellites:%d altitude:%f\n",
mod.Session.GPS.Latitude,
mod.Session.GPS.Longitude,
mod.Session.GPS.FixQuality,
mod.Session.GPS.NumSatellites,
mod.Session.GPS.Altitude)
mod.Session.Refresh()
@ -133,7 +124,6 @@ func (mod *GPS) Start() error {
}
return mod.SetRunning(true, func() {
defer mod.serial.Close()
for mod.Running() {
@ -141,9 +131,21 @@ func (mod *GPS) Start() error {
if s, err := nmea.Parse(line); err == nil {
// http://aprs.gids.nl/nmea/#gga
if m, ok := s.(nmea.GNGGA); ok {
mod.Session.GPS.GNGGA = m
mod.Session.GPS.Latitude = m.Latitude
mod.Session.GPS.Longitude = m.Longitude
mod.Session.GPS.FixQuality = m.FixQuality
mod.Session.GPS.NumSatellites = m.NumSatellites
mod.Session.GPS.HDOP = m.HDOP
mod.Session.GPS.Altitude = m.Altitude
mod.Session.GPS.Separation = m.Separation
} else if m, ok := s.(nmea.GPGGA); ok {
mod.Session.GPS.GPGGA = m
mod.Session.GPS.Latitude = m.Latitude
mod.Session.GPS.Longitude = m.Longitude
mod.Session.GPS.FixQuality = m.FixQuality
mod.Session.GPS.NumSatellites = m.NumSatellites
mod.Session.GPS.HDOP = m.HDOP
mod.Session.GPS.Altitude = m.Altitude
mod.Session.GPS.Separation = m.Separation
}
} else {
mod.Debug("error parsing line '%s': %s", line, err)

11
session/session.go

@ -21,8 +21,6 @@ import (
"github.com/bettercap/bettercap/network"
"github.com/bettercap/bettercap/packets"
"github.com/adrianmo/go-nmea"
"github.com/evilsocket/islazy/fs"
"github.com/evilsocket/islazy/log"
"github.com/evilsocket/islazy/ops"
@ -74,8 +72,13 @@ func (mm ModuleList) MarshalJSON() ([]byte, error) {
}
type GPS struct {
GNGGA nmea.GNGGA
GPGGA nmea.GPGGA
Latitude float64 // Latitude.
Longitude float64 // Longitude.
FixQuality string // Quality of fix.
NumSatellites int64 // Number of satellites in use.
HDOP float64 // Horizontal dilution of precision.
Altitude float64 // Altitude.
Separation float64 // Geoidal separation
}
type Session struct {