From cfc6da88f511c0b548d1685e58d3885c36c293e9 Mon Sep 17 00:00:00 2001 From: Lurkars Date: Wed, 24 Jul 2019 21:02:08 +0200 Subject: [PATCH] server.py ip --- ext/server.py | 6 +- resources/ui/.~lock.i18n.csv# | 1 + resources/ui/i18n.csv | 139 +++++++++++++++++---------------- scripts/menus/server_create.gd | 2 + 4 files changed, 79 insertions(+), 69 deletions(-) create mode 100644 resources/ui/.~lock.i18n.csv# diff --git a/ext/server.py b/ext/server.py index 8742e1e..3d55ac3 100755 --- a/ext/server.py +++ b/ext/server.py @@ -76,8 +76,12 @@ def create_game(): # gen secret secret = secrets.token_hex(32) + remote_addr = request.remote_addr + if 'X-Forwarded-For' in request.headers: + remote_addr = request.headers.getlist( + "X-Forwarded-For")[0].rpartition(' ')[-1] cur.execute("INSERT INTO games (name,secret,ip,port,bots,player_count,running) VALUES (?,?,?,?,?,0,0)", - (name, secret, request.remote_addr, port, bots)) + (name, secret, remote_addr, port, bots)) con.commit() cur.execute("SELECT id FROM games WHERE secret=?", (secret,)) diff --git a/resources/ui/.~lock.i18n.csv# b/resources/ui/.~lock.i18n.csv# new file mode 100644 index 0000000..fbff34c --- /dev/null +++ b/resources/ui/.~lock.i18n.csv# @@ -0,0 +1 @@ +,lurkars,muffbuntu,24.07.2019 20:53,file:///home/lurkars/.config/libreoffice/4; \ No newline at end of file diff --git a/resources/ui/i18n.csv b/resources/ui/i18n.csv index 0889bc1..b07aa9d 100644 --- a/resources/ui/i18n.csv +++ b/resources/ui/i18n.csv @@ -1,48 +1,51 @@ ,en,de -BACK,back,Zurück -MULTIPLAYER,multiplayer,Multiplayer -PRACTISE,practise,Training -SETTINGS,settings,Einstellungen -DEBUG,debug EN,Debug DE -HOST,host,Host -JOIN,join,Beitreten -QUIT,quit,Beenden -DIRECT_HOST,direct host,Direkt hosten -DIRECT_JOIN,direct join,Direkt beitreten -OPEN_GAMES_ONLY,open games only,Nur offene Spiele -REFRESH,refresh,Aktualisieren -CREATE_GAME,create game,Spiel erstellen -PLAYER_NAME,name,Name -PLAYER_COLOR,color,Farbe -BOTS,bots,Bots -GAME,game,Spiel -PORT,port,Port -IP,IP,IP -RESUME,resume,Fortsetzen -END_GAME,end game,Spiel beenden -START_GAME,start game,Spiel starten -GAME_NAME,name,Name -READY,ready,Bereit +BACK,Back,Zurück +MULTIPLAYER,Multiplayer,Multiplayer +PRACTISE,Practise,Training +SETTINGS,Settings,Einstellungen +DEBUG,Debug en,Debug DE +HOST,Host,Host +JOIN,Join,Beitreten +QUIT,Quit,Beenden +DIRECT_HOST,Direct host,Direkt hosten +DIRECT_JOIN,Direct join,Direkt beitreten +OPEN_GAMES_ONLY,Open games only,Nur offene Spiele +REFRESH,Refresh,Aktualisieren +CREATE_GAME,Create game,Spiel erstellen +PLAYER_NAME,Name,Name +PLAYER_COLOR,Color,Farbe +BOTS,Bots,Bots +GAME,Game,Spiel +PORT,Port,Port +IP,Ip,IP +RESUME,Resume,Fortsetzen +END_GAME,End game,Spiel beenden +START_GAME,Start game,Spiel starten +GAME_NAME,Name,Name +READY,Ready,Bereit ALERT,Alert!,Fehler! -CONTROLS,controls,Steuerung -RESET,reset,Zurücksetzen +CONTROLS,Controls,Steuerung +RESET,Reset,Zurücksetzen PRESS_KEY,Press any key...,Taste drücken… -ERROR_SERVER_CREATION,Cannot create Server!,Server konnte nicht erstellt werden! -INVALID_IP4,Invalid IPv4 address!,Ungültige IPv4 Adresse! +ERROR_SERVER_CREATION,Cannot create server!,Server konnte nicht erstellt werden! +ERROR_GAME_CREATION,"Cannot create game! +(Server full or blocked?)","Spiel konnte nicht erstellt werden! +(Server voll oder blockiert?)" +INVALID_IP4,Invalid ipv4 address!,Ungültige IPv4 Adresse! SERVER_DISCONNECTED,Server disconnected!,Serververbindung getrennt! SERVER_NO_CONNECTION,No connection to server!,Keine Verbindung zu Server! CONNECTION_FAILED,Connection failed!,Verbindung fehlgeschlagen! -SYSTEM,system,System -LOCALE,language,Sprache -LOCALE_EN,english,Englisch (english) -LOCALE_DE,german (Deutsch),Deutsch -GRAPHICS,graphics,Grafik -SAVE,save,Speichern -APPLY,apply,Übernehmen -KEYBOARD,keyboard,Tastatur -JOYPAD,joypad,Joypad -SERVER_ADDR,server address,Server Adresse -API_ADDR,api adress,API Adresse +SYSTEM,System,System +LOCALE,Language,Sprache +LOCALE_EN,English,Englisch (english) +LOCALE_DE,German (deutsch),Deutsch +GRAPHICS,Graphics,Grafik +SAVE,Save,Speichern +APPLY,Apply,Übernehmen +KEYBOARD,Keyboard,Tastatur +JOYPAD,Joypad,Joypad +SERVER_ADDR,Server address,Server Adresse +API_ADDR,API adress,API Adresse Up,,Hoch Down,,Runter Left,,Links @@ -56,33 +59,33 @@ Delete,,Entf Home,,Pos 1 End,,Ende ,, -StraightLong,straight,Gerade -Straight,short straight,kurze Gerade -CornerLarge,right corner,Rechtskurve -CornerLargeFlipped,left corner,Linkskurve -CornerLarger,long right corner,lange Rechtskurve -CornerLargerFlipped,long left corner,lange Linkskurve -CornerSmall,short right corner,kurze Rechtskurve -CornerSmallFlipped,short left corner,kurze Linkskurve -StraightLongBump,bump,Bodenwelle -Bump,small bump,kurze Bodenwelle -StraightSkew,right skew,rechte Schräge -StraightSkewFlipped,left skew,linke Schräge -RampLong,ramp up,Rampe hoch -RampLongFlipped,ramp down,Rampe runter -RampLongCurved,curved ramp up,Rundung hoch -RampLongCurvedFlipped,curved ramp down,Rundung runter -Ramp,short ramp up,kurze Rampe hoch -RampFlipped,short ramp down,kurze Rampe runter -CurvedFlipped,shicane right,Schikane rechts -Curved,shicane left,Schikane links -Loop,looping,Looping +StraightLong,Straight,Gerade +Straight,Short straight,kurze Gerade +CornerLarge,Right corner,Rechtskurve +CornerLargeFlipped,Left corner,Linkskurve +CornerLarger,Long right corner,lange Rechtskurve +CornerLargerFlipped,Long left corner,lange Linkskurve +CornerSmall,Short right corner,kurze Rechtskurve +CornerSmallFlipped,Short left corner,kurze Linkskurve +StraightLongBump,Bump,Bodenwelle +Bump,Small bump,kurze Bodenwelle +StraightSkew,Right skew,rechte Schräge +StraightSkewFlipped,Left skew,linke Schräge +RampLong,Ramp up,Rampe hoch +RampLongFlipped,Ramp down,Rampe runter +RampLongCurved,Curved ramp up,Rundung hoch +RampLongCurvedFlipped,Curved ramp down,Rundung runter +Ramp,Short ramp up,kurze Rampe hoch +RampFlipped,Short ramp down,kurze Rampe runter +CurvedFlipped,Shicane right,Schikane rechts +Curved,Shicane left,Schikane links +Loop,Looping,Looping ,, -controls_thrust,thrust,Beschleunigen -controls_break,break,Bremsen -controls_add_road,add,Setzen -controls_next_road_type,next type,Nächste Kategorie -controls_prev_road_type,previous type,Vorherige Kategorie -controls_next_road_variant,next variant,Nächste Variante -controls_prev_road_variant,previous variant,Vorherige Variante -controls_reset,reset,Zurücksetzen +controls_thrust,Thrust,Beschleunigen +controls_break,Break,Bremsen +controls_add_road,Add,Setzen +controls_next_road_type,Next type,Nächste Kategorie +controls_prev_road_type,Previous type,Vorherige Kategorie +controls_next_road_variant,Next variant,Nächste Variante +controls_prev_road_variant,Previous variant,Vorherige Variante +controls_reset,Reset,Zurücksetzen diff --git a/scripts/menus/server_create.gd b/scripts/menus/server_create.gd index ab12ad9..b4793c5 100644 --- a/scripts/menus/server_create.gd +++ b/scripts/menus/server_create.gd @@ -29,6 +29,8 @@ func _on_game_created(result, response_code, headers, body): var json = JSON.parse(body.get_string_from_utf8()) gamestate.game_name = json.result['name'] client.join_game(game_server.get_server_addr(), int(json.result['port'])) + else: + get_tree().get_root().get_node("multiplayer_menu").show_error_dialog(tr("ERROR_GAME_CREATION")) queue_free()