ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init: Add support for SOCK_SEQPACKET socket type

Browse source 
Change-Id: Ib264ecf9beb2685b070436d2bdec9655c7a31b47
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood 2010-10-01 08:20:36 -04:00
parent 2f7b72f9e8
commit 912ff85b03
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/init.c
View file

@ -206,9 +206,10 @@ void service_start(struct service *svc, const char *dynamic_args)
add_environment(ei->name, ei->value); add_environment(ei->name, ei->value);
for (si = svc->sockets; si; si = si->next) { for (si = svc->sockets; si; si = si->next) {
int s = create_socket(si->name, int socket_type = (
!strcmp(si->type, "dgram") ? !strcmp(si->type, "stream") ? SOCK_STREAM :
SOCK_DGRAM : SOCK_STREAM, (!strcmp(si->type, "dgram") ? SOCK_DGRAM : SOCK_SEQPACKET));
int s = create_socket(si->name, socket_type,
si->perm, si->uid, si->gid); si->perm, si->uid, si->gid);
if (s >= 0) { if (s >= 0) {
publish_socket(si->name, s); publish_socket(si->name, s);

5
init/init_parser.c
View file

@ -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"); parse_error(state, "socket option requires name, type, perm arguments\n");
break; break;
} }
if (strcmp(args[2],"dgram") && strcmp(args[2],"stream")) { if (strcmp(args[2],"dgram") && strcmp(args[2],"stream")
parse_error(state, "socket type must be 'dgram' or 'stream'\n"); && strcmp(args[2],"seqpacket")) {
parse_error(state, "socket type must be 'dgram', 'stream' or 'seqpacket'\n");
break; break;
} }
si = calloc(1, sizeof(*si)); si = calloc(1, sizeof(*si));

2
init/readme.txt
View file

@ -72,7 +72,7 @@ setenv <name> <value>
socket <name> <type> <perm> [ <user> [ <group> ] ] socket <name> <type> <perm> [ <user> [ <group> ] ]
Create a unix domain socket named /dev/socket/<name> and pass 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 and group default to 0.
user <username> user <username>