From 2eb6cc8f55e070c2e9128aada72e4855a49c29a0 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 3 Oct 2017 15:07:26 +0200 Subject: [PATCH] Don't add myself to findhash result if ip detection failed --- src/File/FileRequest.py | 11 ++++++++--- src/Translate/languages/da.json | 4 ++-- src/Translate/languages/de.json | 4 ++-- src/Translate/languages/es.json | 4 ++-- src/Translate/languages/fr.json | 4 ++-- src/Translate/languages/hu.json | 4 ++-- src/Translate/languages/it.json | 4 ++-- src/Translate/languages/nl.json | 4 ++-- src/Translate/languages/pl.json | 4 ++-- src/Translate/languages/pt-br.json | 4 ++-- src/Translate/languages/ru.json | 4 ++-- src/Translate/languages/tr.json | 4 ++-- src/Translate/languages/zh-tw.json | 4 ++-- src/Translate/languages/zh.json | 4 ++-- 14 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index 878b6f5f..29d0a012 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -336,6 +336,7 @@ class FileRequest(object): self.response({"error": "Unknown site"}) return False + s = time.time() # Add peer to site if not added before peer = site.addPeer(self.connection.ip, self.connection.port, return_peer=True) if not peer.connection: # Just added @@ -386,8 +387,11 @@ class FileRequest(object): elif config.ip_external: # External ip defined my_ip = helper.packAddress(config.ip_external, self.server.port) my_back = back_ip4 - else: # No external ip defined - my_ip = my_ip = helper.packAddress(self.server.ip, self.server.port) + elif self.server.ip and self.server.ip != "*": # No external ip defined + my_ip = helper.packAddress(self.server.ip, self.server.port) + my_back = back_ip4 + else: + my_ip = None my_back = back_ip4 my_hashfield_set = set(site.content_manager.hashfield) @@ -395,7 +399,8 @@ class FileRequest(object): if hash_id in my_hashfield_set: if hash_id not in my_back: my_back[hash_id] = [] - my_back[hash_id].append(my_ip) # Add myself + if my_ip: + my_back[hash_id].append(my_ip) # Add myself if config.verbose: self.log.debug( diff --git a/src/Translate/languages/da.json b/src/Translate/languages/da.json index 87ff8954..90509dd1 100644 --- a/src/Translate/languages/da.json +++ b/src/Translate/languages/da.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Tillykke, din port ({0}) er åben.
Du er nu fuld klient på ZeroNet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Tillykke, din port ({0}) er åben.
Du er nu fuld klient på ZeroNet!", "Tor mode active, every connection using Onion route.": "TOR er aktiv, alle forbindelser anvender Onions.", "Successfully started Tor onion hidden services.": "OK. Startede TOR skjult onion service.", "Unable to start hidden services, please check your config.": "Fejl. Kunne ikke starte TOR skjult onion service. Tjek din opsætning!", "For faster connections open {0} port on your router.": "Åben port {0} på din router for hurtigere forbindelse.", "Your connection is restricted. Please, open {0} port on your router": "Begrænset forbindelse. Åben venligst port {0} på din router", - "or configure Tor to become a full member of the ZeroNet network.": "eller opsæt TOR for fuld adgang til ZeroNet!", + "or configure Tor to become full member of ZeroNet network.": "eller opsæt TOR for fuld adgang til ZeroNet!", "Select account you want to use in this site:": "Vælg bruger til brug på denne side:", "currently selected": "nuværende bruger", diff --git a/src/Translate/languages/de.json b/src/Translate/languages/de.json index d234cdad..ceedab24 100644 --- a/src/Translate/languages/de.json +++ b/src/Translate/languages/de.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Gratulation, dein Port {0} ist offen.
Du bist ein volles Mitglied des ZeroNet Netzwerks!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Gratulation, dein Port {0} ist offen.
Du bist ein volles Mitglied des ZeroNet Netzwerks!", "Tor mode active, every connection using Onion route.": "Tor modus aktiv, jede verbindung nutzt die Onion Route.", "Successfully started Tor onion hidden services.": "Tor versteckte Dienste erfolgreich gestartet.", "Unable to start hidden services, please check your config.": "Nicht möglich versteckte Dienste zu starten.", "For faster connections open {0} port on your router.": "Für schnellere verbindungen öffne Port {0} auf deinem Router.", "Your connection is restricted. Please, open {0} port on your router": "Deine Verbindung ist eingeschränkt. Bitte öffne Port {0} auf deinem Router", - "or configure Tor to become a full member of the ZeroNet network.": "oder konfiguriere Tor um ein volles Mitglied des ZeroNet Netzwerks zu werden.", + "or configure Tor to become full member of ZeroNet network.": "oder konfiguriere Tor um ein volles Mitglied des ZeroNet Netzwerks zu werden.", "Select account you want to use in this site:": "Wähle das Konto, dass du auf dieser Seite benutzen willst:", "currently selected": "aktuell ausgewählt", diff --git a/src/Translate/languages/es.json b/src/Translate/languages/es.json index cfb6e26e..659dc0e9 100644 --- a/src/Translate/languages/es.json +++ b/src/Translate/languages/es.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "¡Felicidades! tu puerto {0} está abierto.
¡Eres un miembro completo de la red Zeronet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "¡Felicidades! tu puerto {0} está abierto.
¡Eres un miembro completo de la red Zeronet!", "Tor mode active, every connection using Onion route.": "Modo Tor activado, cada conexión usa una ruta Onion.", "Successfully started Tor onion hidden services.": "Tor ha iniciado satisfactoriamente la ocultación de los servicios onion.", "Unable to start hidden services, please check your config.": "No se puedo iniciar los servicios ocultos, por favor comprueba tu configuración.", "For faster connections open {0} port on your router.": "Para conexiones más rápidas abre el puerto {0} en tu router.", "Your connection is restricted. Please, open {0} port on your router": "Tu conexión está limitada. Por favor, abre el puerto {0} en tu router", - "or configure Tor to become a full member of the ZeroNet network.": "o configura Tor para convertirte en un miembro completo de la red ZeroNet.", + "or configure Tor to become full member of ZeroNet network.": "o configura Tor para convertirte en un miembro completo de la red ZeroNet.", "Select account you want to use in this site:": "Selecciona la cuenta que quieres utilizar en este sitio:", "currently selected": "actualmente seleccionada", diff --git a/src/Translate/languages/fr.json b/src/Translate/languages/fr.json index dc0e5754..b6881cc4 100644 --- a/src/Translate/languages/fr.json +++ b/src/Translate/languages/fr.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Félicitations, le port ({0}) est ouvert.
Vous êtes maintenant membre de ZeroNet!!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Félicitations, le port ({0}) est ouvert.
Vous êtes maintenant membre de ZeroNet!!", "Tor mode active, every connection using Onion route.": "Tor actif, toutes les connections utilisent un routage Onion.", "Successfully started Tor onion hidden services.": "Tor activé avec succès.", "Unable to start hidden services, please check your config.": "Incapable d'activer Tor, veuillez vérifier votre configuration.", "For faster connections open {0} port on your router.": "Pour une meilleure connectivité, ouvrez le port {0} sur votre routeur.", "Your connection is restricted. Please, open {0} port on your router": "Connectivité limitée. Veuillez ouvrir le port {0} sur votre routeur", - "or configure Tor to become a full member of the ZeroNet network.": "ou configurez Tor afin d'avoir accès aux pairs ZeroNet Onion.", + "or configure Tor to become full member of ZeroNet network.": "ou configurez Tor afin d'avoir accès aux pairs ZeroNet Onion.", "Select account you want to use in this site:": "Sélectionnez le compte que vous voulez utiliser pour ce site:", "currently selected": "présentement sélectionné", diff --git a/src/Translate/languages/hu.json b/src/Translate/languages/hu.json index 666c31c7..eb43615f 100644 --- a/src/Translate/languages/hu.json +++ b/src/Translate/languages/hu.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Gratulálunk, a portod ({0}) nyitva van.
Teljes értékű tagja vagy a hálózatnak!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Gratulálunk, a portod ({0}) nyitva van.
Teljes értékű tagja vagy a hálózatnak!", "Tor mode active, every connection using Onion route.": "Tor mód aktív, minden kapcsolat az Onion hálózaton keresztül történik.", "Successfully started Tor onion hidden services.": "Sikeresen elindultak a Tor onion titkos szolgáltatások.", "Unable to start hidden services, please check your config.": "Nem sikerült elindítani a Tor onion szolgáltatásokat. Kérjük, ellenőrizd a beállításokat!", "For faster connections open {0} port on your router.": "A gyorsabb kapcsolatok érdekében nyisd ki a {0} portot a routereden.", "Your connection is restricted. Please, open {0} port on your router": "A kapcsolatod korlátozott. Kérjük, nyisd ki a {0} portot a routereden", - "or configure Tor to become a full member of the ZeroNet network.": "vagy állítsd be a Tor kliensed, hogy teljes értékű tagja legyél a hálózatnak!", + "or configure Tor to become full member of ZeroNet network.": "vagy állítsd be a Tor kliensed, hogy teljes értékű tagja legyél a hálózatnak!", "Select account you want to use in this site:": "Válaszd ki az oldalhoz használt felhasználónevet:", "currently selected": "jelenleg kijelölt", diff --git a/src/Translate/languages/it.json b/src/Translate/languages/it.json index 3d7651d7..95c69de0 100644 --- a/src/Translate/languages/it.json +++ b/src/Translate/languages/it.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Congratulazioni, la tua porta ({0}) è aperta.
Sei ora pieno membro della rete ZeroNet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Congratulazioni, la tua porta ({0}) è aperta.
Sei ora pieno membro della rete ZeroNet!", "Tor mode active, every connection using Onion route.": "Modalità Tor attiva, ogni connessione sta usando la rete Onion.", "Successfully started Tor onion hidden services.": "Tor onion hidden service avviati con successo.", "Unable to start hidden services, please check your config.": "Impossibile avviare gli hidden service. Si prega di controllare la propria configurazione!", "For faster connections open {0} port on your router.": "Per avere connessioni più veloci devi aprire la porta {0} sul tuo router.", "Your connection is restricted. Please, open {0} port on your router": "La tua connessione è limitata. Dovresti aprire la porta {0} sul tuo router", - "or configure Tor to become a full member of the ZeroNet network.": "o configurare Tor per diventare pieno membro della rete ZeroNet!", + "or configure Tor to become full member of ZeroNet network.": "o configurare Tor per diventare pieno membro della rete ZeroNet!", "Select account you want to use in this site:": "Seleziona l'account che vuoi utilizzare per questo sito:", "currently selected": "attualmente selezionato", diff --git a/src/Translate/languages/nl.json b/src/Translate/languages/nl.json index 6e7d364a..d2cd241c 100644 --- a/src/Translate/languages/nl.json +++ b/src/Translate/languages/nl.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Gefeliciteerd, je poort {0} is geopend.
Je bent een volledig lid van het ZeroNet netwerk!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Gefeliciteerd, je poort {0} is geopend.
Je bent een volledig lid van het ZeroNet netwerk!", "Tor mode active, every connection using Onion route.": "Tor modus actief, elke verbinding gebruikt een Onion route.", "Successfully started Tor onion hidden services.": "Tor onion verborgen diensten zijn met succes gestart.", "Unable to start hidden services, please check your config.": "Het was niet mogelijk om verborgen diensten te starten, controleer je configuratie.", "For faster connections open {0} port on your router.": "Voor snellere verbindingen open je de poort {0} op je router.", "Your connection is restricted. Please, open {0} port on your router": "Je verbinding is beperkt. Open altjeblieft poort {0} op je router", - "or configure Tor to become a full member of the ZeroNet network.": "of configureer Tor om een volledig lid van het ZeroNet netwerk te worden.", + "or configure Tor to become full member of ZeroNet network.": "of configureer Tor om een volledig lid van het ZeroNet netwerk te worden.", "Select account you want to use in this site:": "Selecteer het account die je wilt gebruiken binnen deze site:", "currently selected": "huidige selectie", diff --git a/src/Translate/languages/pl.json b/src/Translate/languages/pl.json index 32f03bee..e3087c73 100644 --- a/src/Translate/languages/pl.json +++ b/src/Translate/languages/pl.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Gratulacje, twój port {0} jest otwarty.
Jesteś pełnoprawnym użytkownikiem sieci ZeroNet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Gratulacje, twój port {0} jest otwarty.
Jesteś pełnoprawnym użytkownikiem sieci ZeroNet!", "Tor mode active, every connection using Onion route.": "Tryb Tor aktywny, każde połączenie przy użyciu trasy Cebulowej.", "Successfully started Tor onion hidden services.": "Pomyślnie zainicjowano ukryte usługi cebulowe Tor.", "Unable to start hidden services, please check your config.": "Niezdolny do uruchomienia ukrytych usług, proszę sprawdź swoją konfigurację.", "For faster connections open {0} port on your router.": "Dla szybszego połączenia otwórz {0} port w swoim routerze.", "Your connection is restricted. Please, open {0} port on your router": "Połączenie jest ograniczone. Proszę, otwórz port {0} w swoim routerze", - "or configure Tor to become a full member of the ZeroNet network.": "bądź skonfiguruj Tora by stać się pełnoprawnym użytkownikiem sieci ZeroNet.", + "or configure Tor to become full member of ZeroNet network.": "bądź skonfiguruj Tora by stać się pełnoprawnym użytkownikiem sieci ZeroNet.", "Select account you want to use in this site:": "Wybierz konto którego chcesz użyć na tej stronie:", "currently selected": "aktualnie wybrany", diff --git a/src/Translate/languages/pt-br.json b/src/Translate/languages/pt-br.json index e9700ed3..d0aaf541 100644 --- a/src/Translate/languages/pt-br.json +++ b/src/Translate/languages/pt-br.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Parabéns, a porta{0} está aberta.
Você é um membro completo da rede ZeroNet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Parabéns, a porta{0} está aberta.
Você é um membro completo da rede ZeroNet!", "Tor mode active, every connection using Onion route.": "Modo Tor ativado, todas as conexões usam a rota Onion.", "Successfully started Tor onion hidden services.": "Os serviços ocultos Tor onion foram inciados com sucesso.", "Unable to start hidden services, please check your config.": "Não foi possível iniciar os serviços ocultos, por favor verifique suas configurações.", "For faster connections open {0} port on your router.": "Para conexões mais rápidas, abra a porta {0} em seu roteador.", "Your connection is restricted. Please, open {0} port on your router": "Sua conexão está restrita. Por favor, abra a porta {0} em seu roteador", - "or configure Tor to become a full member of the ZeroNet network.": "ou configure o Tor para se tornar um membro completo da rede ZeroNet.", + "or configure Tor to become full member of ZeroNet network.": "ou configure o Tor para se tornar um membro completo da rede ZeroNet.", "Select account you want to use in this site:": "Selecione a conta que deseja usar nesse site:", "currently selected": "atualmente selecionada", diff --git a/src/Translate/languages/ru.json b/src/Translate/languages/ru.json index 5996cd19..5bb1c4e4 100644 --- a/src/Translate/languages/ru.json +++ b/src/Translate/languages/ru.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Поздравляем, ваш порт {0} открыт.
Вы полноценный участник сети ZeroNet!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Поздравляем, ваш порт {0} открыт.
Вы полноценный участник сети ZeroNet!", "Tor mode active, every connection using Onion route.": "Режим Tor включен, все соединения осуществляются через Tor.", "Successfully started Tor onion hidden services.": "Скрытый сервис Tor запущено успешно.", "Unable to start hidden services, please check your config.": "Ошибка при запуске скрытого сервиса, пожалуйста проверьте настройки", "For faster connections open {0} port on your router.": "Для более быстрой работы сети откройте {0} порт на вашем роутере.", "Your connection is restricted. Please, open {0} port on your router": "Подключение ограничено. Пожалуйста откройте {0} порт на вашем роутере", - "or configure Tor to become a full member of the ZeroNet network.": "или настройте Tor что бы стать полноценным участником сети ZeroNet.", + "or configure Tor to become full member of ZeroNet network.": "или настройте Tor что бы стать полноценным участником сети ZeroNet.", "Select account you want to use in this site:": "Выберите аккаунт для использования на этом сайте:", "currently selected": "сейчас выбран", diff --git a/src/Translate/languages/tr.json b/src/Translate/languages/tr.json index c27fc1f4..0bdabd89 100644 --- a/src/Translate/languages/tr.json +++ b/src/Translate/languages/tr.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "Tebrikler, portunuz ({0}) açık.
Artık ZeroNet ağına katıldınız!", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "Tebrikler, portunuz ({0}) açık.
Artık ZeroNet ağına katıldınız!", "Tor mode active, every connection using Onion route.": "Tor aktif, tüm bağlantılar Onion yönlendircisini kullanıyor.", "Successfully started Tor onion hidden services.": "Gizli Tor hizmetleri başlatıldı.", "Unable to start hidden services, please check your config.": "Gizli hizmetler başlatılamadı, lütfen ayarlarınızı kontrol ediniz.", "For faster connections open {0} port on your router.": "Daha hızlı bağlantı için {0} nolu portu bilgisayarınıza yönlendirin.", "Your connection is restricted. Please, open {0} port on your router": "Sınırlı bağlantı. Lütfen, {0} nolu portu bilgisayarınıza yönlendirin", - "or configure Tor to become a full member of the ZeroNet network.": "ya da ZeroNet ağına tam olarak katılabilmek için Tor'u kullanın.", + "or configure Tor to become full member of ZeroNet network.": "ya da ZeroNet ağına tam olarak katılabilmek için Tor'u kullanın.", "Select account you want to use in this site:": "Bu sitede kullanmak için bir hesap seçiniz:", "currently selected": "kullanılan", diff --git a/src/Translate/languages/zh-tw.json b/src/Translate/languages/zh-tw.json index ea0130a0..a30dd023 100644 --- a/src/Translate/languages/zh-tw.json +++ b/src/Translate/languages/zh-tw.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "祝賀，你的埠 ({0}) 已經打開。
你已經是 ZeroNet 網路的正式成員了！", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "祝賀，你的埠 ({0}) 已經打開。
你已經是 ZeroNet 網路的正式成員了！", "Tor mode active, every connection using Onion route.": "Tor 模式啟用，每個連接正在使用洋蔥路由。", "Successfully started Tor onion hidden services.": "成功啟動 Tor 洋蔥隱藏服務。", "Unable to start hidden services, please check your config.": "無法打開隱藏服務，請檢查你的配置。", "For faster connections open {0} port on your router.": "為了更快的連接請在路由器上打開 {0} 埠。", "Your connection is restricted. Please, open {0} port on your router": "你的連接受限制。請在你的路由器上打開 {0} 埠", - "or configure Tor to become a full member of the ZeroNet network.": "或者配置你的 Tor 來成為 ZeroNet 的正式成員。", + "or configure Tor to become full member of ZeroNet network.": "或者配置你的 Tor 來成為 ZeroNet 的正式成員。", "Select account you want to use in this site:": "選擇你要在這個網站使用的帳戶：", "currently selected": "當前選擇", diff --git a/src/Translate/languages/zh.json b/src/Translate/languages/zh.json index 2d6c1f5d..e0b1232f 100644 --- a/src/Translate/languages/zh.json +++ b/src/Translate/languages/zh.json @@ -1,11 +1,11 @@ { - "Congratulations, your port {0} is opened.
You are a full member of the ZeroNet network!": "祝贺，你的端口 ({0}) 已经打开。
你已经是 ZeroNet 网络的正式成员了！", + "Congratulation, your port {0} is opened.
You are full member of ZeroNet network!": "祝贺，你的端口 ({0}) 已经打开。
你已经是 ZeroNet 网络的正式成员了！", "Tor mode active, every connection using Onion route.": "Tor 模式启用，每个连接正在使用洋葱路由。", "Successfully started Tor onion hidden services.": "成功启动 Tor 洋葱隐藏服务。", "Unable to start hidden services, please check your config.": "无法打开隐藏服务，请检查你的配置。", "For faster connections open {0} port on your router.": "为了更快的连接请在路由器上打开 {0} 端口。", "Your connection is restricted. Please, open {0} port on your router": "你的连接受限制。请在你的路由器上打开 {0} 端口", - "or configure Tor to become a full member of the ZeroNet network.": "或者配置你的 Tor 来成为 ZeroNet 的正式成员。", + "or configure Tor to become full member of ZeroNet network.": "或者配置你的 Tor 来成为 ZeroNet 的正式成员。", "Select account you want to use in this site:": "选择你要在这个网站使用的帐户:", "currently selected": "当前选择",