projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change tui_update_source_window_as_is to be a method
[external/binutils.git]
/
gdb
/
ser-tcp.c
diff --git
a/gdb/ser-tcp.c
b/gdb/ser-tcp.c
index
618d2d9
..
7498319
100644
(file)
--- a/
gdb/ser-tcp.c
+++ b/
gdb/ser-tcp.c
@@
-1,6
+1,6
@@
/* Serial interface for raw TCP connections on Un*x like systems.
/* Serial interface for raw TCP connections on Un*x like systems.
- Copyright (C) 1992-201
8
Free Software Foundation, Inc.
+ Copyright (C) 1992-201
9
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-24,8
+24,8
@@
#include "gdbcmd.h"
#include "cli/cli-decode.h"
#include "cli/cli-setshow.h"
#include "gdbcmd.h"
#include "cli/cli-decode.h"
#include "cli/cli-setshow.h"
-#include "filestuff.h"
-#include "netstuff.h"
+#include "
gdbsupport/
filestuff.h"
+#include "
gdbsupport/
netstuff.h"
#include <sys/types.h>
#include <sys/types.h>
@@
-36,11
+36,10
@@
#include <sys/ioctl.h> /* For FIONBIO. */
#endif
#include <sys/ioctl.h> /* For FIONBIO. */
#endif
-#include "gdb_sys_time.h"
+#include "gdb
support/gdb
_sys_time.h"
#ifdef USE_WIN32API
#ifdef USE_WIN32API
-#include <winsock2.h>
-#include <wspiapi.h>
+#include <ws2tcpip.h>
#ifndef ETIMEDOUT
#define ETIMEDOUT WSAETIMEDOUT
#endif
#ifndef ETIMEDOUT
#define ETIMEDOUT WSAETIMEDOUT
#endif
@@
-320,7
+319,7
@@
net_open (struct serial *scb, const char *name)
{
got_connrefused = false;
{
got_connrefused = false;
- for (
struct
addrinfo *iter = ainfo; iter != NULL; iter = iter->ai_next)
+ for (addrinfo *iter = ainfo; iter != NULL; iter = iter->ai_next)
{
/* Iterate over the list of possible addresses to connect
to. For each, we'll try to connect and see if it
{
/* Iterate over the list of possible addresses to connect
to. For each, we'll try to connect and see if it
@@
-371,7
+370,7
@@
net_open (struct serial *scb, const char *name)
ioctl (scb->fd, FIONBIO, &ioarg);
ioctl (scb->fd, FIONBIO, &ioarg);
- if (success_ainfo->ai_
socktype
== IPPROTO_TCP)
+ if (success_ainfo->ai_
protocol
== IPPROTO_TCP)
{
/* Disable Nagle algorithm. Needed in some cases. */
int tmp = 1;
{
/* Disable Nagle algorithm. Needed in some cases. */
int tmp = 1;
@@
-481,27
+480,27
@@
_initialize_ser_tcp (void)
#endif /* USE_WIN32API */
add_prefix_cmd ("tcp", class_maintenance, set_tcp_cmd, _("\
#endif /* USE_WIN32API */
add_prefix_cmd ("tcp", class_maintenance, set_tcp_cmd, _("\
-TCP protocol specific variables\n\
-Configure variables specific to remote TCP connections"),
+TCP protocol specific variables
.
\n\
+Configure variables specific to remote TCP connections
.
"),
&tcp_set_cmdlist, "set tcp ",
0 /* allow-unknown */, &setlist);
add_prefix_cmd ("tcp", class_maintenance, show_tcp_cmd, _("\
&tcp_set_cmdlist, "set tcp ",
0 /* allow-unknown */, &setlist);
add_prefix_cmd ("tcp", class_maintenance, show_tcp_cmd, _("\
-TCP protocol specific variables\n\
-Configure variables specific to remote TCP connections"),
+TCP protocol specific variables
.
\n\
+Configure variables specific to remote TCP connections
.
"),
&tcp_show_cmdlist, "show tcp ",
0 /* allow-unknown */, &showlist);
add_setshow_boolean_cmd ("auto-retry", class_obscure,
&tcp_auto_retry, _("\
&tcp_show_cmdlist, "show tcp ",
0 /* allow-unknown */, &showlist);
add_setshow_boolean_cmd ("auto-retry", class_obscure,
&tcp_auto_retry, _("\
-Set auto-retry on socket connect"), _("\
-Show auto-retry on socket connect
"),
+Set auto-retry on socket connect
.
"), _("\
+Show auto-retry on socket connect
."),
NULL, NULL, NULL,
&tcp_set_cmdlist, &tcp_show_cmdlist);
add_setshow_uinteger_cmd ("connect-timeout", class_obscure,
&tcp_retry_limit, _("\
NULL, NULL, NULL,
&tcp_set_cmdlist, &tcp_show_cmdlist);
add_setshow_uinteger_cmd ("connect-timeout", class_obscure,
&tcp_retry_limit, _("\
-Set timeout limit in seconds for socket connection"), _("\
-Show timeout limit in seconds for socket connection"), _("\
+Set timeout limit in seconds for socket connection
.
"), _("\
+Show timeout limit in seconds for socket connection
.
"), _("\
If set to \"unlimited\", GDB will keep attempting to establish a\n\
connection forever, unless interrupted with Ctrl-c.\n\
The default is 15 seconds."),
If set to \"unlimited\", GDB will keep attempting to establish a\n\
connection forever, unless interrupted with Ctrl-c.\n\
The default is 15 seconds."),