shinyoukai/marisa
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename "bind" parameter to "listen"

Browse Source 
git-svn-id: file:///srv/svn/repo/marisa/trunk@48 d6811dac-2434-b64a-9ddc-f563ab233461
This commit is contained in:
dev
2021-10-20 19:44:48 +00:00
parent 08cc450c9a
commit 6c74263fca
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
partage.go
View File

@@ -40,7 +40,7 @@ var conf struct {
user string user string
group string group string
chroot string chroot string
bind string listen string
baseuri string baseuri string
rootdir string rootdir string
tmplpath string tmplpath string
@@ -254,7 +254,7 @@ func parseconfig(file string) error {
return err return err
} }
conf.bind = cfg.Section("").Key("bind").String() conf.listen = cfg.Section("").Key("listen").String()
conf.user = cfg.Section("").Key("user").String() conf.user = cfg.Section("").Key("user").String()
conf.group = cfg.Section("").Key("group").String() conf.group = cfg.Section("").Key("group").String()
conf.baseuri = cfg.Section("").Key("baseuri").String() conf.baseuri = cfg.Section("").Key("baseuri").String()
@@ -297,7 +297,7 @@ func main() {
var listener net.Listener var listener net.Listener
/* default values */ /* default values */
conf.bind = "0.0.0.0:8080" conf.listen = "0.0.0.0:8080"
conf.baseuri = "http://127.0.0.1:8080" conf.baseuri = "http://127.0.0.1:8080"
conf.rootdir = "static" conf.rootdir = "static"
conf.tmplpath = "templates" conf.tmplpath = "templates"
@@ -326,23 +326,23 @@ func main() {
syscall.Chroot(conf.chroot) syscall.Chroot(conf.chroot)
} }
if conf.bind[0] == '/' { if conf.listen[0] == '/' {
listener, err = net.Listen("unix", conf.bind) listener, err = net.Listen("unix", conf.listen)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
/* Ensure unix socket is removed on exit */ /* Ensure unix socket is removed on exit */
defer os.Remove(conf.bind) defer os.Remove(conf.listen)
sigs := make(chan os.Signal, 1) sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
go func() { go func() {
_ = <-sigs _ = <-sigs
os.Remove(conf.bind) os.Remove(conf.listen)
os.Exit(0) os.Exit(0)
}() }()
} else { } else {
listener, err = net.Listen("tcp", conf.bind) listener, err = net.Listen("tcp", conf.listen)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@@ -358,7 +358,7 @@ func main() {
} }
if listener.Addr().Network() == "unix" { if listener.Addr().Network() == "unix" {
os.Chown(conf.bind, uid, gid) os.Chown(conf.listen, uid, gid)
} }
syscall.Setuid(uid) syscall.Setuid(uid)
@@ -369,7 +369,7 @@ func main() {
http.Handle(conf.filectx, http.StripPrefix(conf.filectx, http.FileServer(http.Dir(conf.filepath)))) http.Handle(conf.filectx, http.StripPrefix(conf.filectx, http.FileServer(http.Dir(conf.filepath))))
if verbose { if verbose {
log.Printf("Listening on %s", conf.bind) log.Printf("Listening on %s", conf.listen)
} }
if listener.Addr().Network() == "unix" { if listener.Addr().Network() == "unix" {