only start Tor and use it to fetch if the reseed URL is an .onion URL until further notice

This commit is contained in:
idk
2020-09-08 21:50:48 -04:00
parent 455357064f
commit 50598209ea
3 changed files with 7 additions and 8 deletions

View File

@ -10,7 +10,7 @@ import (
func Monitor(info map[string]string) []error {
var errs []error
for url, cert := range info {
data, err := MakeReseedDataMap(url, cert)
data, err := MakeReseedDataMap(url, cert, true)
if err != nil {
errs = append(errs, err)
}
@ -26,7 +26,7 @@ func SortedMonitor(info []string) []error {
var errs []error
for _, kv := range info {
url, cert := Split(kv)
data, err := MakeReseedDataMap(url, cert)
data, err := MakeReseedDataMap(url, cert, true)
if err != nil {
errs = append(errs, err)
}

View File

@ -11,10 +11,10 @@ import (
)
//func MakeReseedData(url, cert string) (map[string]string, error) {
func MakeReseedData(url, cert string) (*su3.File, error) {
func MakeReseedData(url, cert string, onion bool) (*su3.File, error) {
// var m map[string]string
url = PrepURL(url)
su3bytes, err := FetchReseed(url, cert)
su3bytes, err := FetchReseed(url, cert, onion)
if err != nil {
return nil, err
}
@ -39,8 +39,8 @@ func MakeReseedData(url, cert string) (*su3.File, error) {
return su3file, nil
}
func MakeReseedDataMap(url, cert string) (map[string]string, error) {
su3data, err := MakeReseedData(url, cert)
func MakeReseedDataMap(url, cert string, onion bool) (map[string]string, error) {
su3data, err := MakeReseedData(url, cert, onion)
if err != nil {
return nil, err
}

View File

@ -13,10 +13,9 @@ import (
"github.com/cretz/bine/tor"
)
func FetchReseed(url, cert string) ([]byte, error) {
func FetchReseed(url, cert string, onion bool) ([]byte, error) {
url = url + "/i2pseeds.su3"
// Start tor with default config (can set start conf's DebugWriter to os.Stdout for debug logs)
onion := false
var t *tor.Tor
if strings.Contains(url, ".onion") {
onion = true