X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fremote_bitbang.c;h=a1c11b2445d0e917dacfaba546cb86a54a4f584b;hp=941a07f147857ab2c71e7afa6c0ba21c42eb9cfe;hb=fb9277191b715566c82b633a474a5c7c78fcfe1a;hpb=47a276cfae12e73b66d8af3889ba558ad3f157eb diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c index 941a07f147..a1c11b2445 100644 --- a/src/jtag/drivers/remote_bitbang.c +++ b/src/jtag/drivers/remote_bitbang.c @@ -15,22 +15,20 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#ifndef _WIN32 #include #include +#endif #include #include "bitbang.h" -/* from unix man page and sys/un.h: */ -#define UNIX_PATH_MAX 108 - /* arbitrary limit on host name length: */ #define REMOTE_BITBANG_HOST_MAX 255 @@ -41,8 +39,8 @@ exit(-1); \ } while (0) -static char remote_bitbang_host[REMOTE_BITBANG_HOST_MAX] = "openocd"; -static uint16_t remote_bitbang_port; +static char *remote_bitbang_host; +static char *remote_bitbang_port; FILE *remote_bitbang_in; FILE *remote_bitbang_out; @@ -72,6 +70,9 @@ static int remote_bitbang_quit(void) return ERROR_FAIL; } + free(remote_bitbang_host); + free(remote_bitbang_port); + LOG_INFO("remote_bitbang interface quit"); return ERROR_OK; } @@ -128,68 +129,56 @@ static struct bitbang_interface remote_bitbang_bitbang = { .blink = &remote_bitbang_blink, }; -static int remote_bitbang_speed(int speed) -{ - return ERROR_OK; -} - static int remote_bitbang_init_tcp(void) { - LOG_INFO("Connecting to %s:%i", remote_bitbang_host, remote_bitbang_port); - int fd = socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - LOG_ERROR("socket: %s", strerror(errno)); + struct addrinfo hints = { .ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM }; + struct addrinfo *result, *rp; + int fd; + + LOG_INFO("Connecting to %s:%s", + remote_bitbang_host ? remote_bitbang_host : "localhost", + remote_bitbang_port); + + /* Obtain address(es) matching host/port */ + int s = getaddrinfo(remote_bitbang_host, remote_bitbang_port, &hints, &result); + if (s != 0) { + LOG_ERROR("getaddrinfo: %s\n", gai_strerror(s)); return ERROR_FAIL; } - struct hostent *hent = gethostbyname(remote_bitbang_host); - if (hent == NULL) { - char *errorstr = "???"; - switch (h_errno) { - case HOST_NOT_FOUND: - errorstr = "host not found"; - break; - case NO_ADDRESS: - errorstr = "no address"; - break; - case NO_RECOVERY: - errorstr = "no recovery"; - break; - case TRY_AGAIN: - errorstr = "try again"; - break; - } - LOG_ERROR("gethostbyname: %s", errorstr); - return ERROR_FAIL; - } + /* getaddrinfo() returns a list of address structures. + Try each address until we successfully connect(2). + If socket(2) (or connect(2)) fails, we (close the socket + and) try the next address. */ - struct sockaddr_in addr; - addr.sin_family = AF_INET; - addr.sin_port = htons(remote_bitbang_port); - addr.sin_addr = *(struct in_addr *)hent->h_addr; - if (connect(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) { - LOG_ERROR("connect: %s", strerror(errno)); - return ERROR_FAIL; - } + for (rp = result; rp != NULL ; rp = rp->ai_next) { + fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (fd == -1) + continue; - remote_bitbang_in = fdopen(fd, "r"); - if (remote_bitbang_in == NULL) { - LOG_ERROR("fdopen: failed to open read stream"); - return ERROR_FAIL; + if (connect(fd, rp->ai_addr, rp->ai_addrlen) != -1) + break; /* Success */ + + close(fd); } - remote_bitbang_out = fdopen(fd, "w"); - if (remote_bitbang_out == NULL) { - LOG_ERROR("fdopen: failed to open write stream"); + freeaddrinfo(result); /* No longer needed */ + + if (rp == NULL) { /* No address succeeded */ + LOG_ERROR("Failed to connect: %s", strerror(errno)); return ERROR_FAIL; } - LOG_INFO("remote_bitbang driver initialized"); - return ERROR_OK; + return fd; } static int remote_bitbang_init_unix(void) { + if (remote_bitbang_host == NULL) { + LOG_ERROR("host/socket not specified"); + return ERROR_FAIL; + } + LOG_INFO("Connecting to unix socket %s", remote_bitbang_host); int fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) { @@ -199,23 +188,42 @@ static int remote_bitbang_init_unix(void) struct sockaddr_un addr; addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, remote_bitbang_host, UNIX_PATH_MAX); - addr.sun_path[UNIX_PATH_MAX-1] = '\0'; + strncpy(addr.sun_path, remote_bitbang_host, sizeof(addr.sun_path)); + addr.sun_path[sizeof(addr.sun_path)-1] = '\0'; if (connect(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) { LOG_ERROR("connect: %s", strerror(errno)); return ERROR_FAIL; } + return fd; +} + +static int remote_bitbang_init(void) +{ + int fd; + bitbang_interface = &remote_bitbang_bitbang; + + LOG_INFO("Initializing remote_bitbang driver"); + if (remote_bitbang_port == NULL) + fd = remote_bitbang_init_unix(); + else + fd = remote_bitbang_init_tcp(); + + if (fd < 0) + return fd; + remote_bitbang_in = fdopen(fd, "r"); if (remote_bitbang_in == NULL) { LOG_ERROR("fdopen: failed to open read stream"); + close(fd); return ERROR_FAIL; } remote_bitbang_out = fdopen(fd, "w"); if (remote_bitbang_out == NULL) { LOG_ERROR("fdopen: failed to open write stream"); + fclose(remote_bitbang_in); return ERROR_FAIL; } @@ -223,33 +231,13 @@ static int remote_bitbang_init_unix(void) return ERROR_OK; } -static int remote_bitbang_init(void) -{ - bitbang_interface = &remote_bitbang_bitbang; - - LOG_INFO("Initializing remote_bitbang driver"); - if (remote_bitbang_port == 0) - return remote_bitbang_init_unix(); - return remote_bitbang_init_tcp(); -} - -static int remote_bitbang_khz(int khz, int *jtag_speed) -{ - *jtag_speed = 0; - return ERROR_OK; -} - -static int remote_bitbang_speed_div(int speed, int *khz) -{ - /* I don't think this really matters any. */ - *khz = 1; - return ERROR_OK; -} - COMMAND_HANDLER(remote_bitbang_handle_remote_bitbang_port_command) { if (CMD_ARGC == 1) { - COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], remote_bitbang_port); + uint16_t port; + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], port); + free(remote_bitbang_port); + remote_bitbang_port = port == 0 ? NULL : strdup(CMD_ARGV[0]); return ERROR_OK; } return ERROR_COMMAND_SYNTAX_ERROR; @@ -258,8 +246,8 @@ COMMAND_HANDLER(remote_bitbang_handle_remote_bitbang_port_command) COMMAND_HANDLER(remote_bitbang_handle_remote_bitbang_host_command) { if (CMD_ARGC == 1) { - strncpy(remote_bitbang_host, CMD_ARGV[0], REMOTE_BITBANG_HOST_MAX); - remote_bitbang_host[REMOTE_BITBANG_HOST_MAX-1] = '\0'; + free(remote_bitbang_host); + remote_bitbang_host = strdup(CMD_ARGV[0]); return ERROR_OK; } return ERROR_COMMAND_SYNTAX_ERROR; @@ -271,7 +259,7 @@ static const struct command_registration remote_bitbang_command_handlers[] = { .handler = remote_bitbang_handle_remote_bitbang_port_command, .mode = COMMAND_CONFIG, .help = "Set the port to use to connect to the remote jtag.\n" - " if 0, use unix sockets to connect to the remote jtag.", + " if 0 or unset, use unix sockets to connect to the remote jtag.", .usage = "port_number", }, { @@ -279,7 +267,7 @@ static const struct command_registration remote_bitbang_command_handlers[] = { .handler = remote_bitbang_handle_remote_bitbang_host_command, .mode = COMMAND_CONFIG, .help = "Set the host to use to connect to the remote jtag.\n" - " if port is 0, this is the name of the unix socket to use.", + " if port is 0 or unset, this is the name of the unix socket to use.", .usage = "host_name", }, COMMAND_REGISTRATION_DONE, @@ -288,10 +276,7 @@ static const struct command_registration remote_bitbang_command_handlers[] = { struct jtag_interface remote_bitbang_interface = { .name = "remote_bitbang", .execute_queue = &bitbang_execute_queue, - .speed = &remote_bitbang_speed, .commands = remote_bitbang_command_handlers, .init = &remote_bitbang_init, .quit = &remote_bitbang_quit, - .khz = &remote_bitbang_khz, - .speed_div = &remote_bitbang_speed_div, };