Don't add myself to findhash result if ip detection failed
This commit is contained in:
shortcutme
parent
8ae9b5261e
commit
2eb6cc8f55
14 changed files with 34 additions and 29 deletions
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Tillykke, din port (<b>{0}</b>) er åben.<br>Du er nu fuld klient på ZeroNet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Tillykke, din port (<b>{0}</b>) er åben.<br>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 <b>{0}</b> port on your router.": "Åben port <b>{0}</b> på din router for hurtigere forbindelse.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Begrænset forbindelse. Åben venligst port <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Gratulation, dein Port <b>{0}</b> ist offen.<br>Du bist ein volles Mitglied des ZeroNet Netzwerks!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Gratulation, dein Port <b>{0}</b> ist offen.<br>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 <b>{0}</b> port on your router.": "Für schnellere verbindungen öffne Port <b>{0}</b> auf deinem Router.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Deine Verbindung ist eingeschränkt. Bitte öffne Port <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "¡Felicidades! tu puerto <b>{0}</b> está abierto.<br>¡Eres un miembro completo de la red Zeronet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "¡Felicidades! tu puerto <b>{0}</b> está abierto.<br>¡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 <b>{0}</b> port on your router.": "Para conexiones más rápidas abre el puerto <b>{0}</b> en tu router.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Tu conexión está limitada. Por favor, abre el puerto <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Félicitations, le port (<b>{0}</b>) est ouvert.<br>Vous êtes maintenant membre de ZeroNet!!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Félicitations, le port (<b>{0}</b>) est ouvert.<br>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 <b>{0}</b> port on your router.": "Pour une meilleure connectivité, ouvrez le port <b>{0}</b> sur votre routeur.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Connectivité limitée. Veuillez ouvrir le port <b>{0}</b> 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é",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Gratulálunk, a portod (<b>{0}</b>) nyitva van.<br>Teljes értékű tagja vagy a hálózatnak!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Gratulálunk, a portod (<b>{0}</b>) nyitva van.<br>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 <b>{0}</b> port on your router.": "A gyorsabb kapcsolatok érdekében nyisd ki a <b>{0}</b> portot a routereden.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "A kapcsolatod korlátozott. Kérjük, nyisd ki a <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Congratulazioni, la tua porta (<b>{0}</b>) è aperta.<br>Sei ora pieno membro della rete ZeroNet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Congratulazioni, la tua porta (<b>{0}</b>) è aperta.<br>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 <b>{0}</b> port on your router.": "Per avere connessioni più veloci devi aprire la porta <b>{0}</b> sul tuo router.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "La tua connessione è limitata. Dovresti aprire la porta <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Gefeliciteerd, je poort <b>{0}</b> is geopend.<br>Je bent een volledig lid van het ZeroNet netwerk!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Gefeliciteerd, je poort <b>{0}</b> is geopend.<br>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 <b>{0}</b> port on your router.": "Voor snellere verbindingen open je de poort <b>{0}</b> op je router.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Je verbinding is beperkt. Open altjeblieft poort <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Gratulacje, twój port <b>{0}</b> jest otwarty.<br>Jesteś pełnoprawnym użytkownikiem sieci ZeroNet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Gratulacje, twój port <b>{0}</b> jest otwarty.<br>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 <b>{0}</b> port on your router.": "Dla szybszego połączenia otwórz <b>{0}</b> port w swoim routerze.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Połączenie jest ograniczone. Proszę, otwórz port <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Parabéns, a porta<b>{0}</b> está aberta.<br>Você é um membro completo da rede ZeroNet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Parabéns, a porta<b>{0}</b> está aberta.<br>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 <b>{0}</b> port on your router.": "Para conexões mais rápidas, abra a porta <b>{0}</b> em seu roteador.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Sua conexão está restrita. Por favor, abra a porta <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Поздравляем, ваш порт <b>{0}</b> открыт.<br>Вы полноценный участник сети ZeroNet!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Поздравляем, ваш порт <b>{0}</b> открыт.<br>Вы полноценный участник сети 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 <b>{0}</b> port on your router.": "Для более быстрой работы сети откройте <b>{0}</b> порт на вашем роутере.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Подключение ограничено. Пожалуйста откройте <b>{0}</b> порт на вашем роутере",
|
||||
"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": "сейчас выбран",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "Tebrikler, portunuz (<b>{0}</b>) açık.<br>Artık ZeroNet ağına katıldınız!",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "Tebrikler, portunuz (<b>{0}</b>) açık.<br>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 <b>{0}</b> port on your router.": "Daha hızlı bağlantı için <b>{0}</b> nolu portu bilgisayarınıza yönlendirin.",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "Sınırlı bağlantı. Lütfen, <b>{0}</b> 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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "祝賀，你的埠 (<b>{0}</b>) 已經打開。<br>你已經是 ZeroNet 網路的正式成員了！",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "祝賀，你的埠 (<b>{0}</b>) 已經打開。<br>你已經是 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 <b>{0}</b> port on your router.": "為了更快的連接請在路由器上打開 <b>{0}</b> 埠。",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "你的連接受限制。請在你的路由器上打開 <b>{0}</b> 埠",
|
||||
"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": "當前選擇",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"Congratulations, your port <b>{0}</b> is opened.<br>You are a full member of the ZeroNet network!": "祝贺，你的端口 (<b>{0}</b>) 已经打开。<br>你已经是 ZeroNet 网络的正式成员了！",
|
||||
"Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!": "祝贺，你的端口 (<b>{0}</b>) 已经打开。<br>你已经是 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 <b>{0}</b> port on your router.": "为了更快的连接请在路由器上打开 <b>{0}</b> 端口。",
|
||||
"Your connection is restricted. Please, open <b>{0}</b> port on your router": "你的连接受限制。请在你的路由器上打开 <b>{0}</b> 端口",
|
||||
"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": "当前选择",
|
||||
|
|
|
|||
Loading…
Reference in a new issue