summaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-30 17:32:03 -0700
committerElliott Hughes <enh@google.com>2015-05-01 17:09:34 -0700
commit92af733ee202caa3b5475fe27fcc81582f11e7c8 (patch)
tree0e5d4bc49cc6299f80a0cccd4ba205d5dfcbb3cb /adb/adb.h
parent5cffd971997ace97ebfd2ecb7d43a64c03cf3169 (diff)
downloadsystem_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.zip
system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.gz
system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.bz2
More adb buffer fixes.
This patch factors out a lot of the basic protocol code: sending OKAY, sending FAIL, and sending a length-prefixed string. ADB_TRACE has been non-optional for a long time, so let's just remove the #ifs. Also actually build the device tracker test tool (and remove its duplicate). Bug: http://b/20666660 Change-Id: I6c7d59f18707bdc62ca69dea45547617f9f31fc6 (cherry picked from commit e67f1f87d9b1188ec8617035db7006c37ee7b21e)
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/adb/adb.h b/adb/adb.h
index b8c6156..fd9d0e6 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -209,6 +209,8 @@ struct atransport
unsigned char token[TOKEN_SIZE];
fdevent auth_fde;
unsigned failed_auth_attempts;
+
+ const char* connection_state_name() const;
};
@@ -369,7 +371,6 @@ enum subproc_mode {
#define USB_FFS_ADB_IN USB_FFS_ADB_EP(ep2)
#endif
-int sendfailmsg(int fd, const char *reason);
int handle_host_request(char *service, transport_type ttype, char* serial, int reply_fd, asocket *s);
void handle_online(atransport *t);