diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-10-01 05:54:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 05:54:06 -0700 |
| commit | 64092e852d0879d07ded15c429473c45da389454 (patch) | |
| tree | 0600f66e208b1428c259c506a9cee20fc73504d1 /init | |
| parent | e3ba1801f0b6f9a1fc1c46e4c057afdd8a45efe1 (diff) | |
| parent | 78ea2374c5c87d7bb58747b1a6173c598f386600 (diff) | |
| download | system_core-64092e852d0879d07ded15c429473c45da389454.zip system_core-64092e852d0879d07ded15c429473c45da389454.tar.gz system_core-64092e852d0879d07ded15c429473c45da389454.tar.bz2 | |
am 78ea2374: am 912ff85b: init: Add support for SOCK_SEQPACKET socket type
Merge commit '78ea2374c5c87d7bb58747b1a6173c598f386600'
* commit '78ea2374c5c87d7bb58747b1a6173c598f386600':
init: Add support for SOCK_SEQPACKET socket type
Diffstat (limited to 'init')
| -rwxr-xr-x | init/init.c | 7 | ||||
| -rw-r--r-- | init/init_parser.c | 5 | ||||
| -rw-r--r-- | init/readme.txt | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/init/init.c b/init/init.c index 98539b8..709cc40 100755 --- a/init/init.c +++ b/init/init.c @@ -206,9 +206,10 @@ void service_start(struct service *svc, const char *dynamic_args) add_environment(ei->name, ei->value); for (si = svc->sockets; si; si = si->next) { - int s = create_socket(si->name, - !strcmp(si->type, "dgram") ? - SOCK_DGRAM : SOCK_STREAM, + int socket_type = ( + !strcmp(si->type, "stream") ? SOCK_STREAM : + (!strcmp(si->type, "dgram") ? SOCK_DGRAM : SOCK_SEQPACKET)); + int s = create_socket(si->name, socket_type, si->perm, si->uid, si->gid); if (s >= 0) { publish_socket(si->name, s); diff --git a/init/init_parser.c b/init/init_parser.c index 585a5b5..d136c28 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -587,8 +587,9 @@ static void parse_line_service(struct parse_state *state, int nargs, char **args parse_error(state, "socket option requires name, type, perm arguments\n"); break; } - if (strcmp(args[2],"dgram") && strcmp(args[2],"stream")) { - parse_error(state, "socket type must be 'dgram' or 'stream'\n"); + if (strcmp(args[2],"dgram") && strcmp(args[2],"stream") + && strcmp(args[2],"seqpacket")) { + parse_error(state, "socket type must be 'dgram', 'stream' or 'seqpacket'\n"); break; } si = calloc(1, sizeof(*si)); diff --git a/init/readme.txt b/init/readme.txt index a185790..df524a6 100644 --- a/init/readme.txt +++ b/init/readme.txt @@ -72,7 +72,7 @@ setenv <name> <value> socket <name> <type> <perm> [ <user> [ <group> ] ] Create a unix domain socket named /dev/socket/<name> and pass - its fd to the launched process. <type> must be "dgram" or "stream". + its fd to the launched process. <type> must be "dgram", "stream" or "seqpacket". User and group default to 0. user <username> |