X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f2620548144b356661614eba36c9de12ef31395c..f4604d0d467ae510f8167d3109e6fd05f57f1cde:/server/server.c diff --git a/server/server.c b/server/server.c index 781c71a..2d4ab79 100644 --- a/server/server.c +++ b/server/server.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2009 Richard Kettlewell + * Copyright (C) 2004-2012 Richard Kettlewell * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,6 +42,7 @@ int wideopen; struct listener { const char *name; int pf; + int privileged; }; struct conn; @@ -165,7 +166,7 @@ static int writer_error(ev_source attribute((unused)) *ev, D(("S%x writer completed", c->tag)); } else { if(errno_value != EPIPE) - error(errno_value, "S%x write error on socket", c->tag); + disorder_error(errno_value, "S%x write error on socket", c->tag); if(c->r) { D(("cancel reader")); ev_reader_cancel(c->r); @@ -189,7 +190,7 @@ static int reader_error(ev_source attribute((unused)) *ev, struct conn *c = u; D(("server reader_error S%x %d", c->tag, errno_value)); - error(errno_value, "S%x read error on socket", c->tag); + disorder_error(errno_value, "S%x read error on socket", c->tag); if(c->w) ev_writer_close(c->w); c->w = 0; @@ -201,9 +202,9 @@ static int reader_error(ev_source attribute((unused)) *ev, static int c_disable(struct conn *c, char **vec, int nvec) { if(nvec == 0) - disable_playing(c->who); + disable_playing(c->who, c->ev); else if(nvec == 1 && !strcmp(vec[0], "now")) - disable_playing(c->who); + disable_playing(c->who, c->ev); else { sink_writes(ev_writer_sink(c->w), "550 invalid argument\n"); return 1; /* completed */ @@ -242,14 +243,14 @@ static int c_play(struct conn *c, char **vec, sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); return 1; } - q = queue_add(track, c->who, WHERE_BEFORE_RANDOM, origin_picked); + q = queue_add(track, c->who, WHERE_BEFORE_RANDOM, NULL, origin_picked); queue_write(); - /* If we added the first track, and something is playing, then prepare the - * new track. If nothing is playing then we don't bother as it wouldn't gain - * anything. */ - if(q == qhead.next && playing) - prepare(c->ev, q); sink_printf(ev_writer_sink(c->w), "252 %s\n", q->id); + /* We make sure the track at the head of the queue is prepared, just in case + * we added it. We could be more subtle but prepare() will ensure we don't + * prepare the same track twice so there's no point. */ + if(qhead.next != &qhead) + prepare(c->ev, qhead.next); /* If the queue was empty but we are for some reason paused then * unpause. */ if(!playing) resume_playing(0); @@ -257,6 +258,46 @@ static int c_play(struct conn *c, char **vec, return 1; /* completed */ } +static int c_playafter(struct conn *c, char **vec, + int attribute((unused)) nvec) { + const char *track; + struct queue_entry *q; + const char *afterme = vec[0]; + + for(int n = 1; n < nvec; ++n) { + if(!trackdb_exists(vec[n])) { + sink_writes(ev_writer_sink(c->w), "550 track is not in database\n"); + return 1; + } + if(!(track = trackdb_resolve(vec[n]))) { + sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); + return 1; + } + q = queue_add(track, c->who, WHERE_AFTER, afterme, origin_picked); + if(!q) { + sink_printf(ev_writer_sink(c->w), "550 No such ID\n"); + return 1; + } + disorder_info("added %s as %s after %s", track, q->id, afterme); + afterme = q->id; + } + queue_write(); + sink_printf(ev_writer_sink(c->w), "252 OK\n"); + /* We make sure the track at the head of the queue is prepared, just in case + * we added it. We could be more subtle but prepare() will ensure we don't + * prepare the same track twice so there's no point. */ + if(qhead.next != &qhead) { + prepare(c->ev, qhead.next); + disorder_info("prepared %s", qhead.next->id); + } + /* If the queue was empty but we are for some reason paused then + * unpause. */ + if(!playing) + resume_playing(0); + play(c->ev); + return 1; /* completed */ +} + static int c_remove(struct conn *c, char **vec, int attribute((unused)) nvec) { struct queue_entry *q; @@ -266,7 +307,7 @@ static int c_remove(struct conn *c, char **vec, return 1; } if(!right_removable(c->rights, c->who, q)) { - error(0, "%s attempted remove but lacks required rights", c->who); + disorder_error(0, "%s attempted remove but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), "510 Not authorized to remove that track\n"); return 1; @@ -295,7 +336,7 @@ static int c_scratch(struct conn *c, * playing track then you will get 550 if you weren't authorized to scratch * the currently playing track. */ if(!right_scratchable(c->rights, c->who, playing)) { - error(0, "%s attempted scratch but lacks required rights", c->who); + disorder_error(0, "%s attempted scratch but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), "510 Not authorized to scratch that track\n"); return 1; @@ -340,7 +381,7 @@ static int c_resume(struct conn *c, static int c_shutdown(struct conn *c, char attribute((unused)) **vec, int attribute((unused)) nvec) { - info("S%x shut down by %s", c->tag, c->who); + disorder_info("S%x shut down by %s", c->tag, c->who); sink_writes(ev_writer_sink(c->w), "250 shutting down\n"); ev_writer_flush(c->w); quit(c->ev); @@ -349,7 +390,7 @@ static int c_shutdown(struct conn *c, static int c_reconfigure(struct conn *c, char attribute((unused)) **vec, int attribute((unused)) nvec) { - info("S%x reconfigure by %s", c->tag, c->who); + disorder_info("S%x reconfigure by %s", c->tag, c->who); if(reconfigure(c->ev, 1)) sink_writes(ev_writer_sink(c->w), "550 error reading new config\n"); else @@ -417,9 +458,9 @@ static int c_rescan(struct conn *c, } } /* Report what was requested */ - info("S%x rescan by %s (%s %s)", c->tag, c->who, - flag_wait ? "wait" : "", - flag_fresh ? "fresh" : ""); + disorder_info("S%x rescan by %s (%s %s)", c->tag, c->who, + flag_wait ? "wait" : "", + flag_fresh ? "fresh" : ""); if(trackdb_rescan_underway()) { if(flag_fresh) { /* We want a fresh rescan but there is already one underway. Arrange a @@ -493,13 +534,14 @@ static const char *connection_host(struct conn *c) { /* get connection data */ l = sizeof u; if(getpeername(c->fd, &u.sa, &l) < 0) { - error(errno, "S%x error calling getpeername", c->tag); + disorder_error(errno, "S%x error calling getpeername", c->tag); return 0; } if(c->l->pf != PF_UNIX) { if((n = getnameinfo(&u.sa, l, host, sizeof host, 0, 0, NI_NUMERICHOST))) { - error(0, "S%x error calling getnameinfo: %s", c->tag, gai_strerror(n)); + disorder_error(0, "S%x error calling getnameinfo: %s", + c->tag, gai_strerror(n)); return 0; } return xstrdup(host); @@ -527,39 +569,41 @@ static int c_user(struct conn *c, k = trackdb_getuserinfo(vec[0]); /* reject nonexistent users */ if(!k) { - error(0, "S%x unknown user '%s' from %s", c->tag, vec[0], host); + disorder_error(0, "S%x unknown user '%s' from %s", c->tag, vec[0], host); sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); return 1; } /* reject unconfirmed users */ if(kvp_get(k, "confirmation")) { - error(0, "S%x unconfirmed user '%s' from %s", c->tag, vec[0], host); + disorder_error(0, "S%x unconfirmed user '%s' from %s", + c->tag, vec[0], host); sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); return 1; } password = kvp_get(k, "password"); if(!password) password = ""; if(parse_rights(kvp_get(k, "rights"), &rights, 1)) { - error(0, "error parsing rights for %s", vec[0]); + disorder_error(0, "error parsing rights for %s", vec[0]); sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); return 1; } /* check whether the response is right */ res = authhash(c->nonce, sizeof c->nonce, password, config->authorization_algorithm); - if(wideopen || (res && !strcmp(res, vec[1]))) { + if(wideopen || c->l->privileged || (res && !strcmp(res, vec[1]))) { c->who = vec[0]; c->rights = rights; /* currently we only bother logging remote connections */ if(strcmp(host, "local")) - info("S%x %s connected from %s", c->tag, vec[0], host); + disorder_info("S%x %s connected from %s", c->tag, vec[0], host); else c->rights |= RIGHT__LOCAL; sink_writes(ev_writer_sink(c->w), "230 OK\n"); return 1; } /* oops, response was wrong */ - info("S%x authentication failure for %s from %s", c->tag, vec[0], host); + disorder_info("S%x authentication failure for %s from %s", + c->tag, vec[0], host); sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); return 1; } @@ -591,7 +635,7 @@ static int c_queue(struct conn *c, if((l = trackdb_get(playing->track, "_length")) && (length = atol(l))) { xtime(&when); - when += length - playing->sofar + config->gap; + when += length - playing->sofar; } } else /* Nothing is playing but playing is enabled, so whatever is @@ -606,7 +650,7 @@ static int c_queue(struct conn *c, if(when) { if((l = trackdb_get(q->track, "_length")) && (length = atol(l))) - when += length + config->gap; + when += length; else when = 0; } @@ -823,7 +867,7 @@ static int c_random_enable(struct conn *c, static int c_random_disable(struct conn *c, char attribute((unused)) **vec, int attribute((unused)) nvec) { - disable_random(c->who); + disable_random(c->who, c->ev); sink_writes(ev_writer_sink(c->w), "250 OK\n"); return 1; /* completed */ } @@ -875,7 +919,8 @@ static int c_volume(struct conn *c, } rights = set ? RIGHT_VOLUME : RIGHT_READ; if(!(c->rights & rights)) { - error(0, "%s attempted to set volume but lacks required rights", c->who); + disorder_error(0, "%s attempted to set volume but lacks required rights", + c->who); sink_writes(ev_writer_sink(c->w), "510 Prohibited\n"); return 1; } @@ -1004,7 +1049,7 @@ static int c_move(struct conn *c, return 1; } if(!has_move_rights(c, &q, 1)) { - error(0, "%s attempted move but lacks required rights", c->who); + disorder_error(0, "%s attempted move but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), "510 Not authorized to move that track\n"); return 1; @@ -1039,7 +1084,8 @@ static int c_moveafter(struct conn *c, return 1; } if(!has_move_rights(c, qs, nvec)) { - error(0, "%s attempted moveafter but lacks required rights", c->who); + disorder_error(0, "%s attempted moveafter but lacks required rights", + c->who); sink_writes(ev_writer_sink(c->w), "510 Not authorized to move those tracks\n"); return 1; @@ -1105,8 +1151,19 @@ static int c_set_global(struct conn *c, sink_writes(ev_writer_sink(c->w), "550 cannot set internal global preferences\n"); return 1; } - trackdb_set_global(vec[0], vec[1], c->who); - sink_printf(ev_writer_sink(c->w), "250 OK\n"); + /* We special-case the 'magic' preferences here. */ + if(!strcmp(vec[0], "playing")) { + (flag_enabled(vec[1]) ? enable_playing : disable_playing)(c->who, c->ev); + sink_printf(ev_writer_sink(c->w), "250 OK\n"); + } else if(!strcmp(vec[0], "random-play")) { + (flag_enabled(vec[1]) ? enable_random : disable_random)(c->who, c->ev); + sink_printf(ev_writer_sink(c->w), "250 OK\n"); + } else { + if(!trackdb_set_global(vec[0], vec[1], c->who)) + sink_printf(ev_writer_sink(c->w), "250 OK\n"); + else + sink_writes(ev_writer_sink(c->w), "550 not found\n"); + } return 1; } @@ -1132,7 +1189,7 @@ static int c_nop(struct conn *c, static int c_new(struct conn *c, char **vec, int nvec) { - int max, n; + int max; char **tracks; if(nvec > 0) @@ -1143,7 +1200,6 @@ static int c_new(struct conn *c, max = config->new_max; tracks = trackdb_new(0, max); sink_printf(ev_writer_sink(c->w), "253 New track list follows\n"); - n = 0; while(*tracks) { sink_printf(ev_writer_sink(c->w), "%s%s\n", **tracks == '.' ? "." : "", *tracks); @@ -1197,7 +1253,7 @@ static int c_cookie(struct conn *c, c->cookie = vec[0]; c->rights = rights; if(strcmp(host, "local")) - info("S%x %s connected with cookie from %s", c->tag, user, host); + disorder_info("S%x %s connected with cookie from %s", c->tag, user, host); else c->rights |= RIGHT__LOCAL; /* Response contains username so client knows who they are acting as */ @@ -1224,7 +1280,7 @@ static int c_revoke(struct conn *c, revoke_cookie(c->cookie); sink_writes(ev_writer_sink(c->w), "250 OK\n"); } else - sink_writes(ev_writer_sink(c->w), "550 Did not log in with cookie\n"); + sink_writes(ev_writer_sink(c->w), "510 Did not log in with cookie\n"); return 1; } @@ -1234,8 +1290,8 @@ static int c_adduser(struct conn *c, const char *rights; if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { - error(0, "S%x: remote adduser", c->tag); - sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + disorder_error(0, "S%x: remote adduser", c->tag); + sink_writes(ev_writer_sink(c->w), "510 Remote user management is disabled\n"); return 1; } if(nvec > 2) { @@ -1260,8 +1316,8 @@ static int c_deluser(struct conn *c, struct conn *d; if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { - error(0, "S%x: remote deluser", c->tag); - sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + disorder_error(0, "S%x: remote deluser", c->tag); + sink_writes(ev_writer_sink(c->w), "510 Remote user management is disabled\n"); return 1; } if(trackdb_deluser(vec[0])) { @@ -1282,8 +1338,8 @@ static int c_edituser(struct conn *c, struct conn *d; if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { - error(0, "S%x: remote edituser", c->tag); - sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + disorder_error(0, "S%x: remote edituser", c->tag); + sink_writes(ev_writer_sink(c->w), "510 Remote user management is disabled\n"); return 1; } /* RIGHT_ADMIN can do anything; otherwise you can only set your own email @@ -1323,7 +1379,8 @@ static int c_edituser(struct conn *c, } sink_writes(ev_writer_sink(c->w), "250 OK\n"); } else { - error(0, "%s attempted edituser but lacks required rights", c->who); + disorder_error(0, "%s attempted edituser but lacks required rights", + c->who); sink_writes(ev_writer_sink(c->w), "510 Restricted to administrators\n"); } return 1; @@ -1340,8 +1397,8 @@ static int c_userinfo(struct conn *c, if(!config->remote_userman && !(c->rights & RIGHT__LOCAL) && strcmp(vec[1], "rights")) { - error(0, "S%x: remote userinfo %s %s", c->tag, vec[0], vec[1]); - sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + disorder_error(0, "S%x: remote userinfo %s %s", c->tag, vec[0], vec[1]); + sink_writes(ev_writer_sink(c->w), "510 Remote user management is disabled\n"); return 1; } /* RIGHT_ADMIN allows anything; otherwise you can only get your own email @@ -1358,7 +1415,8 @@ static int c_userinfo(struct conn *c, else sink_writes(ev_writer_sink(c->w), "550 No such user\n"); } else { - error(0, "%s attempted userinfo but lacks required rights", c->who); + disorder_error(0, "%s attempted userinfo but lacks required rights", + c->who); sink_writes(ev_writer_sink(c->w), "510 Restricted to administrators\n"); } return 1; @@ -1383,7 +1441,7 @@ static int c_register(struct conn *c, * letters and digits, minimizing the chance of the URL being mispasted. */ gcry_randomize(nonce, sizeof nonce, GCRY_STRONG_RANDOM); if(basen(nonce, CONFIRM_SIZE, nonce_str, sizeof nonce_str, 62)) { - error(0, "buffer too small encoding confirmation string"); + disorder_error(0, "buffer too small encoding confirmation string"); sink_writes(ev_writer_sink(c->w), "550 Cannot create user\n"); } byte_xasprintf(&cs, "%s/%s", vec[0], nonce_str); @@ -1413,13 +1471,13 @@ static int c_confirm(struct conn *c, } user = xstrndup(vec[0], sep - vec[0]); if(trackdb_confirm(user, vec[0], &rights)) - sink_writes(ev_writer_sink(c->w), "550 Incorrect confirmation string\n"); + sink_writes(ev_writer_sink(c->w), "510 Incorrect confirmation string\n"); else { c->who = user; c->cookie = 0; c->rights = rights; if(strcmp(host, "local")) - info("S%x %s confirmed from %s", c->tag, user, host); + disorder_info("S%x %s confirmed from %s", c->tag, user, host); else c->rights |= RIGHT__LOCAL; /* Response contains username so client knows who they are acting as */ @@ -1439,7 +1497,7 @@ static int sent_reminder(ev_source attribute((unused)) *ev, if(!status) { sink_writes(ev_writer_sink(c->w), "250 OK\n"); } else { - error(0, "reminder subprocess %s", wstat(status)); + disorder_error(0, "reminder subprocess %s", wstat(status)); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); } /* Re-enable this connection */ @@ -1459,24 +1517,24 @@ static int c_reminder(struct conn *c, static hash *last_reminder; if(!config->mail_sender) { - error(0, "cannot send password reminders because mail_sender not set"); + disorder_error(0, "cannot send password reminders because mail_sender not set"); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); return 1; } if(!(k = trackdb_getuserinfo(vec[0]))) { - error(0, "reminder for user '%s' who does not exist", vec[0]); + disorder_error(0, "reminder for user '%s' who does not exist", vec[0]); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); return 1; } if(!(email = kvp_get(k, "email")) || !email_valid(email)) { - error(0, "user '%s' has no valid email address", vec[0]); + disorder_error(0, "user '%s' has no valid email address", vec[0]); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); return 1; } if(!(password = kvp_get(k, "password")) || !*password) { - error(0, "user '%s' has no password", vec[0]); + disorder_error(0, "user '%s' has no password", vec[0]); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); return 1; } @@ -1488,7 +1546,7 @@ static int c_reminder(struct conn *c, last = hash_find(last_reminder, vec[0]); xtime(&now); if(last && now < *last + config->reminder_interval) { - error(0, "sent a password reminder to '%s' too recently", vec[0]); + disorder_error(0, "sent a password reminder to '%s' too recently", vec[0]); sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); return 1; } @@ -1501,7 +1559,7 @@ static int c_reminder(struct conn *c, "\n" " %s\n", password); if(!(text = mime_encode_text(text, &charset, &encoding))) - fatal(0, "cannot encode email"); + disorder_fatal(0, "cannot encode email"); byte_xasprintf((char **)&content_type, "text/plain;charset=%s", quote822(charset, 0)); pid = sendmail_subprocess("", config->mail_sender, email, @@ -1512,7 +1570,7 @@ static int c_reminder(struct conn *c, return 1; } hash_add(last_reminder, vec[0], &now, HASH_INSERT_OR_REPLACE); - info("sending a passsword reminder to user '%s'", vec[0]); + disorder_info("sending a passsword reminder to user '%s'", vec[0]); /* We can only continue when the subprocess finishes */ ev_child(c->ev, pid, 0, sent_reminder, c); return 0; @@ -1563,7 +1621,7 @@ static int c_schedule_del(struct conn *c, const char *who = kvp_get(actiondata, "who"); if(!who || !c->who || strcmp(who, c->who)) { - sink_writes(ev_writer_sink(c->w), "551 Not authorized\n"); + sink_writes(ev_writer_sink(c->w), "510 Not authorized\n"); return 1; /* completed */ } } @@ -1648,7 +1706,7 @@ static int playlist_response(struct conn *c, case 0: assert(!"cannot cope with success"); case EACCES: - sink_writes(ev_writer_sink(c->w), "550 Access denied\n"); + sink_writes(ev_writer_sink(c->w), "510 Access denied\n"); break; case EINVAL: sink_writes(ev_writer_sink(c->w), "550 Invalid playlist name\n"); @@ -1788,7 +1846,8 @@ static int c_playlist_unlock(struct conn *c, return 1; } -static const struct command { +/** @brief Server's definition of a command */ +static const struct server_command { /** @brief Command name */ const char *name; @@ -1808,12 +1867,12 @@ static const struct command { */ rights_type rights; } commands[] = { - { "adduser", 2, 3, c_adduser, RIGHT_ADMIN|RIGHT__LOCAL }, + { "adduser", 2, 3, c_adduser, RIGHT_ADMIN }, { "adopt", 1, 1, c_adopt, RIGHT_PLAY }, { "allfiles", 0, 2, c_allfiles, RIGHT_READ }, { "confirm", 1, 1, c_confirm, 0 }, { "cookie", 1, 1, c_cookie, 0 }, - { "deluser", 1, 1, c_deluser, RIGHT_ADMIN|RIGHT__LOCAL }, + { "deluser", 1, 1, c_deluser, RIGHT_ADMIN }, { "dirs", 0, 2, c_dirs, RIGHT_READ }, { "disable", 0, 1, c_disable, RIGHT_GLOBAL_PREFS }, { "edituser", 3, 3, c_edituser, RIGHT_ADMIN|RIGHT_USERINFO }, @@ -1833,6 +1892,7 @@ static const struct command { { "part", 3, 3, c_part, RIGHT_READ }, { "pause", 0, 0, c_pause, RIGHT_PAUSE }, { "play", 1, 1, c_play, RIGHT_PLAY }, + { "playafter", 2, INT_MAX, c_playafter, RIGHT_PLAY }, { "playing", 0, 0, c_playing, RIGHT_READ }, { "playlist-delete", 1, 1, c_playlist_delete, RIGHT_PLAY }, { "playlist-get", 1, 1, c_playlist_get, RIGHT_READ }, @@ -1849,7 +1909,7 @@ static const struct command { { "random-enabled", 0, 0, c_random_enabled, RIGHT_READ }, { "recent", 0, 0, c_recent, RIGHT_READ }, { "reconfigure", 0, 0, c_reconfigure, RIGHT_ADMIN }, - { "register", 3, 3, c_register, RIGHT_REGISTER|RIGHT__LOCAL }, + { "register", 3, 3, c_register, RIGHT_REGISTER }, { "reminder", 1, 1, c_reminder, RIGHT__LOCAL }, { "remove", 1, 1, c_remove, RIGHT_REMOVE__MASK }, { "rescan", 0, INT_MAX, c_rescan, RIGHT_RESCAN }, @@ -1952,7 +2012,8 @@ static int command(struct conn *c, char *line) { else { if(commands[n].rights && !(c->rights & commands[n].rights)) { - error(0, "%s attempted %s but lacks required rights", c->who ? c->who : "NULL", + disorder_error(0, "%s attempted %s but lacks required rights", + c->who ? c->who : "NULL", commands[n].name); sink_writes(ev_writer_sink(c->w), "510 Prohibited\n"); return 1; @@ -2015,7 +2076,7 @@ static int reader_callback(ev_source attribute((unused)) *ev, } if(eof) { if(bytes) - error(0, "S%x unterminated line", c->tag); + disorder_error(0, "S%x unterminated line", c->tag); D(("normal reader close")); c->r = 0; if(c->w) { @@ -2046,7 +2107,7 @@ static int listen_callback(ev_source *ev, c->w = ev_writer_new(ev, fd, writer_error, c, "client writer"); if(!c->w) { - error(0, "ev_writer_new for file inbound connection (fd=%d) failed", + disorder_error(0, "ev_writer_new for file inbound connection (fd=%d) failed", fd); close(fd); return 0; @@ -2056,7 +2117,9 @@ static int listen_callback(ev_source *ev, if(!c->r) /* Main reason for failure is the FD is too big and that will already have * been handled */ - fatal(0, "ev_reader_new for file inbound connection (fd=%d) failed", fd); + disorder_fatal(0, + "ev_reader_new for file inbound connection (fd=%d) failed", + fd); ev_tie(c->r, c->w); c->fd = fd; c->reader = reader_callback; @@ -2074,16 +2137,20 @@ static int listen_callback(ev_source *ev, int server_start(ev_source *ev, int pf, size_t socklen, const struct sockaddr *sa, - const char *name) { + const char *name, + int privileged) { int fd; struct listener *l = xmalloc(sizeof *l); static const int one = 1; - D(("server_init socket %s", name)); + D(("server_init socket %s privileged=%d", name, privileged)); + /* Sanity check */ + if(privileged && pf != AF_UNIX) + disorder_fatal(0, "cannot create a privileged listener on a non-local port"); fd = xsocket(pf, SOCK_STREAM, 0); xsetsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one); if(bind(fd, sa, socklen) < 0) { - error(errno, "error binding to %s", name); + disorder_error(errno, "error binding to %s", name); return -1; } xlisten(fd, 128); @@ -2091,9 +2158,10 @@ int server_start(ev_source *ev, int pf, cloexec(fd); l->name = name; l->pf = pf; + l->privileged = privileged; if(ev_listen(ev, fd, listen_callback, l, "server listener")) exit(EXIT_FAILURE); - info("listening on %s", name); + disorder_info("listening on %s", name); return fd; }