wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Switch from using sockaddr to sockaddr_storage." am: 46b0b1c694 am: 4c1b3840f0 

am: cbc6f68e32

* commit 'cbc6f68e320bd30d0cd7fbe73847deacbd54e073':
  Switch from using sockaddr to sockaddr_storage.
This commit is contained in:
Erik Kline 2015-12-08 04:54:05 +00:00 committed by android-build-merger
parent ec28912ecb 2b0a64f26d
commit 2f325ae989
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lmkd.c
View File

@ -397,7 +397,8 @@ static void ctrl_data_handler(uint32_t events) {
} }
static void ctrl_connect_handler(uint32_t events __unused) { static void ctrl_connect_handler(uint32_t events __unused) {
struct sockaddr addr; struct sockaddr_storage ss;
struct sockaddr *addrp = (struct sockaddr *)&ss;
socklen_t alen; socklen_t alen;
struct epoll_event epev; struct epoll_event epev;
@ -406,8 +407,8 @@ static void ctrl_connect_handler(uint32_t events __unused) {
ctrl_dfd_reopened = 1; ctrl_dfd_reopened = 1;
} }
alen = sizeof(addr); alen = sizeof(ss);
ctrl_dfd = accept(ctrl_lfd, &addr, &alen); ctrl_dfd = accept(ctrl_lfd, addrp, &alen);
if (ctrl_dfd < 0) { if (ctrl_dfd < 0) {
ALOGE("lmkd control socket accept failed; errno=%d", errno); ALOGE("lmkd control socket accept failed; errno=%d", errno);