From 92af733ee202caa3b5475fe27fcc81582f11e7c8 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 30 Apr 2015 17:32:03 -0700 Subject: 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) --- adb/adb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'adb/adb.h') 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); -- cgit v1.1