Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
restore functions needed for adb compilation, and interface changes
  • Loading branch information
FauxFaux committed Feb 26, 2017
1 parent 8ae0114 commit af821f0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions adb.c
Expand Up @@ -151,7 +151,7 @@ static void adb_sent(Plug plug, int bufsize)
*/
static const char *adb_init(void *frontend_handle, void **backend_handle,
Conf *conf,
char *host, int port, char **realhost, int nodelay,
const char *host, int port, char **realhost, int nodelay,
int keepalive)
{
static const struct plug_function_table fn_table = {
Expand Down Expand Up @@ -185,7 +185,7 @@ static const char *adb_init(void *frontend_handle, void **backend_handle,
logevent(adb->frontend, buf);
sfree(buf);
}
addr = name_lookup("localhost", port, realhost, conf, conf_get_int(conf, CONF_addressfamily));
addr = name_lookup("localhost", port, realhost, conf, conf_get_int(conf, CONF_addressfamily), NULL, NULL);
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
Expand Down Expand Up @@ -277,7 +277,7 @@ static void adb_reconfig(void *handle, Conf *conf)
/*
* Called to send data down the adb connection.
*/
static int adb_send(void *handle, char *buf, int len)
static int adb_send(void *handle, const char *buf, int len)
{
Adb adb = (Adb) handle;

Expand Down Expand Up @@ -393,6 +393,7 @@ Backend adb_backend = {
adb_provide_logctx,
adb_unthrottle,
adb_cfg_info,
NULL, /* test_for_upstream */
"adb",
PROT_ADB,
5037
Expand Down
2 changes: 1 addition & 1 deletion windows/winpgen.c
Expand Up @@ -1468,7 +1468,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg,
*/
ui_set_state(hwnd, state, 2);
if (cmdline_keygen) {
PostMessage(hwnd, WM_COMMAND, IDC_EXPORT_OPENSSH, 0);
PostMessage(hwnd, WM_COMMAND, IDC_EXPORT_OPENSSH_AUTO, 0);
}
break;
case WM_HELP:
Expand Down

0 comments on commit af821f0

Please sign in to comment.