Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Benjamin Lee
ball-gfx-hal
Commits
384514b8
Commit
384514b8
authored
Jan 26, 2019
by
Benjamin Lee
💬
Browse files
Added hostname lookup for connection and host addresses.
parent
dc3f6856
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/state.rs
View file @
384514b8
...
...
@@ -12,7 +12,7 @@ use log::{error, warn};
use
nalgebra
::
Point2
;
use
palette
::
LinSrgb
;
use
std
::
iter
;
use
std
::
net
::
SocketAddr
;
use
std
::
net
::
{
SocketAddr
,
ToSocketAddrs
}
;
use
std
::
time
::
Instant
;
use
winit
::{
dpi
::
LogicalSize
,
ElementState
,
MouseButton
,
WindowEvent
};
...
...
@@ -313,19 +313,36 @@ impl GameState {
ui
.input_text
(
im_str!
(
"Remote address"
),
server_addr
)
.build
();
if
ui
.small_button
(
im_str!
(
"Connect to server"
))
{
match
server_addr
.to_str
()
.parse
()
{
Ok
(
addr
)
=>
{
match
Connecting
::
connect
(
addr
,
debug
,
cursor
,
)
{
Ok
(
state
)
=>
*
connecting
=
Some
(
state
),
Err
(
err
)
=>
{
match
server_addr
.to_str
()
.to_socket_addrs
()
{
Ok
(
mut
addrs
)
=>
{
match
addrs
.next
()
{
Some
(
addr
)
=>
{
match
Connecting
::
connect
(
addr
,
debug
,
cursor
,
)
{
Ok
(
state
)
=>
{
*
connecting
=
Some
(
state
)
},
Err
(
err
)
=>
{
let
err
=
format!
(
"error connecting to
\
server: {}"
,
err
);
error!
(
"{}"
,
err
);
*
error_text
=
Some
(
ImString
::
new
(
err
),
);
},
}
},
None
=>
{
let
err
=
format!
(
"
error connecting to
server
:
\
{}"
,
er
r
"
couldn't resolve
server
\
address:
{}"
,
s
er
ver_addr
.to_str
()
);
error
!
(
"{}"
,
err
);
warn
!
(
"{}"
,
err
);
*
error_text
=
Some
(
ImString
::
new
(
err
));
},
...
...
@@ -350,17 +367,36 @@ impl GameState {
)
.build
();
if
ui
.small_button
(
im_str!
(
"Host server"
))
{
match
server_addr_host
.to_str
()
.parse
()
{
Ok
(
addr
)
=>
{
match
Connecting
::
host
(
addr
,
debug
,
cursor
)
{
Ok
(
state
)
=>
*
connecting
=
Some
(
state
),
Err
(
err
)
=>
{
match
server_addr_host
.to_str
()
.to_socket_addrs
()
{
Ok
(
mut
addrs
)
=>
{
match
addrs
.next
()
{
Some
(
addr
)
=>
{
match
Connecting
::
host
(
addr
,
debug
,
cursor
,
)
{
Ok
(
state
)
=>
{
*
connecting
=
Some
(
state
)
},
Err
(
err
)
=>
{
let
err
=
format!
(
"error hosting
\
server: {}"
,
err
);
error!
(
"{}"
,
err
);
*
error_text
=
Some
(
ImString
::
new
(
err
),
);
},
}
},
None
=>
{
let
err
=
format!
(
"error hosting server: {}"
,
err
"Couldn't resolve server
\
hosting address: {}"
,
server_addr_host
.to_str
()
);
error
!
(
"{}"
,
err
);
warn
!
(
"{}"
,
err
);
*
error_text
=
Some
(
ImString
::
new
(
err
));
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment