~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'ad0c0f361be0'
[disorder]
/
lib
/
client.c
diff --git
a/lib/client.c
b/lib/client.c
index
a0502eb
..
2cbcfa7
100644
(file)
--- a/
lib/client.c
+++ b/
lib/client.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004-200
8
Richard Kettlewell
+ * Copyright (C) 2004-200
9
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
*
* 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
@@
-107,7
+107,7
@@
static int response(disorder_client *c, char **rp) {
return (r[0] * 10 + r[1]) * 10 + r[2] - 111 * '0';
} else {
c->last = "invalid reply format";
return (r[0] * 10 + r[1]) * 10 + r[2] - 111 * '0';
} else {
c->last = "invalid reply format";
- error(0, "invalid reply format from %s", c->ident);
+
disorder_
error(0, "invalid reply format from %s", c->ident);
return -1;
}
}
return -1;
}
}
@@
-141,10
+141,12
@@
static int check_response(disorder_client *c, char **rp) {
else if(rc / 100 == 2) {
if(rp)
*rp = (rc % 10 == 9) ? 0 : xstrdup(r + 4);
else if(rc / 100 == 2) {
if(rp)
*rp = (rc % 10 == 9) ? 0 : xstrdup(r + 4);
+ xfree(r);
return 0;
} else {
if(c->verbose)
return 0;
} else {
if(c->verbose)
- error(0, "from %s: %s", c->ident, utf82mb(r));
+ disorder_error(0, "from %s: %s", c->ident, utf82mb(r));
+ xfree(r);
return rc;
}
}
return rc;
}
}
@@
-185,7
+187,7
@@
static int disorder_simple_v(disorder_client *c,
if(!c->fpout) {
c->last = "not connected";
if(!c->fpout) {
c->last = "not connected";
- error(0, "not connected to server");
+
disorder_
error(0, "not connected to server");
return -1;
}
if(cmd) {
return -1;
}
if(cmd) {
@@
-200,6
+202,7
@@
static int disorder_simple_v(disorder_client *c,
D(("command: %s", d.vec));
if(fputs(d.vec, c->fpout) < 0)
goto write_error;
D(("command: %s", d.vec));
if(fputs(d.vec, c->fpout) < 0)
goto write_error;
+ xfree(d.vec);
if(body) {
if(nbody < 0)
for(nbody = 0; body[nbody]; ++nbody)
if(body) {
if(nbody < 0)
for(nbody = 0; body[nbody]; ++nbody)
@@
-222,7
+225,7
@@
static int disorder_simple_v(disorder_client *c,
return check_response(c, rp);
write_error:
byte_xasprintf((char **)&c->last, "write error: %s", strerror(errno));
return check_response(c, rp);
write_error:
byte_xasprintf((char **)&c->last, "write error: %s", strerror(errno));
- error(errno, "error writing to %s", c->ident);
+
disorder_
error(errno, "error writing to %s", c->ident);
return -1;
}
return -1;
}
@@
-291,10
+294,12
@@
static int dequote(int rc, char **rp) {
if(!rc) {
if((rr = split(*rp, 0, SPLIT_QUOTES, 0, 0)) && *rr) {
if(!rc) {
if((rr = split(*rp, 0, SPLIT_QUOTES, 0, 0)) && *rr) {
+ xfree(*rp);
*rp = *rr;
*rp = *rr;
+ xfree(rr);
return 0;
}
return 0;
}
- error(0, "invalid reply: %s", *rp);
+
disorder_
error(0, "invalid reply: %s", *rp);
}
return rc;
}
}
return rc;
}
@@
-316,13
+321,13
@@
int disorder_connect_generic(struct config *conf,
const char *username,
const char *password,
const char *cookie) {
const char *username,
const char *password,
const char *cookie) {
- int fd = -1, fd2 = -1, nrvec, rc;
- unsigned char *nonce;
+ int fd = -1, fd2 = -1, nrvec
= 0
, rc;
+ unsigned char *nonce
= NULL
;
size_t nl;
size_t nl;
- c
onst char *res
;
- char *r
, **rvec
;
+ c
har *res = NULL
;
+ char *r
= NULL, **rvec = NULL
;
const char *protocol, *algorithm, *challenge;
const char *protocol, *algorithm, *challenge;
- struct sockaddr *sa;
+ struct sockaddr *sa
= NULL
;
socklen_t salen;
if((salen = find_server(conf, &sa, &c->ident)) == (socklen_t)-1)
socklen_t salen;
if((salen = find_server(conf, &sa, &c->ident)) == (socklen_t)-1)
@@
-330,28
+335,28
@@
int disorder_connect_generic(struct config *conf,
c->fpin = c->fpout = 0;
if((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
byte_xasprintf((char **)&c->last, "socket: %s", strerror(errno));
c->fpin = c->fpout = 0;
if((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
byte_xasprintf((char **)&c->last, "socket: %s", strerror(errno));
- error(errno, "error calling socket");
+
disorder_
error(errno, "error calling socket");
return -1;
}
if(connect(fd, sa, salen) < 0) {
byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno));
return -1;
}
if(connect(fd, sa, salen) < 0) {
byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno));
- error(errno, "error calling connect");
+
disorder_
error(errno, "error calling connect");
goto error;
}
if((fd2 = dup(fd)) < 0) {
byte_xasprintf((char **)&c->last, "dup: %s", strerror(errno));
goto error;
}
if((fd2 = dup(fd)) < 0) {
byte_xasprintf((char **)&c->last, "dup: %s", strerror(errno));
- error(errno, "error calling dup");
+
disorder_
error(errno, "error calling dup");
goto error;
}
if(!(c->fpin = fdopen(fd, "rb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
goto error;
}
if(!(c->fpin = fdopen(fd, "rb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
- error(errno, "error calling fdopen");
+
disorder_
error(errno, "error calling fdopen");
goto error;
}
fd = -1;
if(!(c->fpout = fdopen(fd2, "wb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
goto error;
}
fd = -1;
if(!(c->fpout = fdopen(fd2, "wb"))) {
byte_xasprintf((char **)&c->last, "fdopen: %s", strerror(errno));
- error(errno, "error calling fdopen");
+
disorder_
error(errno, "error calling fdopen");
goto error;
}
fd2 = -1;
goto error;
}
fd2 = -1;
@@
-361,17
+366,17
@@
int disorder_connect_generic(struct config *conf,
goto error;
if(nrvec != 3) {
c->last = "cannot parse server greeting";
goto error;
if(nrvec != 3) {
c->last = "cannot parse server greeting";
- error(0, "cannot parse server greeting %s", r);
+
disorder_
error(0, "cannot parse server greeting %s", r);
goto error;
}
goto error;
}
- protocol =
*rvec++
;
+ protocol =
rvec[0]
;
if(strcmp(protocol, "2")) {
c->last = "unknown protocol version";
if(strcmp(protocol, "2")) {
c->last = "unknown protocol version";
- error(0, "unknown protocol version: %s", protocol);
+
disorder_
error(0, "unknown protocol version: %s", protocol);
goto error;
}
goto error;
}
- algorithm =
*rvec++
;
- challenge =
*rvec++
;
+ algorithm =
rvec[1]
;
+ challenge =
rvec[2]
;
if(!(nonce = unhex(challenge, &nl)))
goto error;
if(cookie) {
if(!(nonce = unhex(challenge, &nl)))
goto error;
if(cookie) {
@@
-380,7
+385,7
@@
int disorder_connect_generic(struct config *conf,
return 0; /* success */
if(!username) {
c->last = "cookie failed and no username";
return 0; /* success */
if(!username) {
c->last = "cookie failed and no username";
- error(0, "cookie did not work and no username available");
+
disorder_
error(0, "cookie did not work and no username available");
goto error;
}
}
goto error;
}
}
@@
-391,6
+396,11
@@
int disorder_connect_generic(struct config *conf,
if((rc = disorder_simple(c, 0, "user", username, res, (char *)0)))
goto error_rc;
c->user = xstrdup(username);
if((rc = disorder_simple(c, 0, "user", username, res, (char *)0)))
goto error_rc;
c->user = xstrdup(username);
+ xfree(res);
+ free_strings(nrvec, rvec);
+ xfree(nonce);
+ xfree(sa);
+ xfree(r);
return 0;
error:
rc = -1;
return 0;
error:
rc = -1;
@@
-437,7
+447,7
@@
int disorder_connect(disorder_client *c) {
if(!(username = config->username)) {
c->last = "no username";
if(!(username = config->username)) {
c->last = "no username";
- error(0, "no username configured");
+
disorder_
error(0, "no username configured");
return -1;
}
password = config->password;
return -1;
}
password = config->password;
@@
-451,7
+461,7
@@
int disorder_connect(disorder_client *c) {
if(!password) {
/* Oh well */
c->last = "no password";
if(!password) {
/* Oh well */
c->last = "no password";
- error(0, "no password configured for user '%s'", username);
+
disorder_
error(0, "no password configured for user '%s'", username);
return -1;
}
return disorder_connect_generic(config,
return -1;
}
return disorder_connect_generic(config,
@@
-492,7
+502,7
@@
int disorder_close(disorder_client *c) {
if(c->fpin) {
if(fclose(c->fpin) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
if(c->fpin) {
if(fclose(c->fpin) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
- error(errno, "error calling fclose");
+
disorder_
error(errno, "error calling fclose");
ret = -1;
}
c->fpin = 0;
ret = -1;
}
c->fpin = 0;
@@
-500,14
+510,16
@@
int disorder_close(disorder_client *c) {
if(c->fpout) {
if(fclose(c->fpout) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
if(c->fpout) {
if(fclose(c->fpout) < 0) {
byte_xasprintf((char **)&c->last, "fclose: %s", strerror(errno));
- error(errno, "error calling fclose");
+
disorder_
error(errno, "error calling fclose");
ret = -1;
}
c->fpout = 0;
}
ret = -1;
}
c->fpout = 0;
}
+ xfree(c->ident);
c->ident = 0;
c->ident = 0;
+ xfree(c->user);
c->user = 0;
c->user = 0;
- return
0
;
+ return
ret
;
}
/** @brief Play a track
}
/** @brief Play a track
@@
-601,7
+613,7
@@
int disorder_version(disorder_client *c, char **rp) {
static void client_error(const char *msg,
void attribute((unused)) *u) {
static void client_error(const char *msg,
void attribute((unused)) *u) {
- error(0, "error parsing reply: %s", msg);
+
disorder_
error(0, "error parsing reply: %s", msg);
}
/** @brief Get currently playing track
}
/** @brief Get currently playing track
@@
-641,6
+653,7
@@
static int disorder_somequeue(disorder_client *c,
if(!strcmp(l, ".")) {
*qt = 0;
*qp = qh;
if(!strcmp(l, ".")) {
*qt = 0;
*qp = qh;
+ xfree(l);
return 0;
}
q = xmalloc(sizeof *q);
return 0;
}
q = xmalloc(sizeof *q);
@@
-648,13
+661,14
@@
static int disorder_somequeue(disorder_client *c,
*qt = q;
qt = &q->next;
}
*qt = q;
qt = &q->next;
}
+ xfree(l);
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
- error(errno, "error reading %s", c->ident);
+
disorder_
error(errno, "error reading %s", c->ident);
} else {
c->last = "input error: unexpxected EOF";
} else {
c->last = "input error: unexpxected EOF";
- error(0, "error reading %s: unexpected EOF", c->ident);
+
disorder_
error(0, "error reading %s: unexpected EOF", c->ident);
}
return -1;
}
}
return -1;
}
@@
-700,16
+714,18
@@
static int readlist(disorder_client *c, char ***vecp, int *nvecp) {
if(nvecp)
*nvecp = v.nvec;
*vecp = v.vec;
if(nvecp)
*nvecp = v.nvec;
*vecp = v.vec;
+ xfree(l);
return 0;
}
return 0;
}
- vector_append(&v, l + (*l == '.'));
+ vector_append(&v, xstrdup(l + (*l == '.')));
+ xfree(l);
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
}
if(ferror(c->fpin)) {
byte_xasprintf((char **)&c->last, "input error: %s", strerror(errno));
- error(errno, "error reading %s", c->ident);
+
disorder_
error(errno, "error reading %s", c->ident);
} else {
c->last = "input error: unexpxected EOF";
} else {
c->last = "input error: unexpxected EOF";
- error(0, "error reading %s: unexpected EOF", c->ident);
+
disorder_
error(0, "error reading %s: unexpected EOF", c->ident);
}
return -1;
}
}
return -1;
}
@@
-826,7
+842,7
@@
int disorder_get(disorder_client *c,
static void pref_error_handler(const char *msg,
void attribute((unused)) *u) {
static void pref_error_handler(const char *msg,
void attribute((unused)) *u) {
- error(0, "error handling 'prefs' reply: %s", msg);
+
disorder_
error(0, "error handling 'prefs' reply: %s", msg);
}
/** @brief Get all preferences for a trcak
}
/** @brief Get all preferences for a trcak
@@
-853,7
+869,9
@@
int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) {
k->name = pvec[0];
k->value = pvec[1];
kp = &k->next;
k->name = pvec[0];
k->value = pvec[1];
kp = &k->next;
+ xfree(pvec);
}
}
+ free_strings(nvec, vec);
*kp = 0;
return 0;
}
*kp = 0;
return 0;
}
@@
-869,7
+887,7
@@
static int boolean(const char *cmd, const char *value,
if(!strcmp(value, "yes")) *flagp = 1;
else if(!strcmp(value, "no")) *flagp = 0;
else {
if(!strcmp(value, "yes")) *flagp = 1;
else if(!strcmp(value, "no")) *flagp = 0;
else {
- error(0, "malformed response to '%s'", cmd);
+
disorder_
error(0, "malformed response to '%s'", cmd);
return -1;
}
return 0;
return -1;
}
return 0;
@@
-1005,7
+1023,7
@@
int disorder_get_volume(disorder_client *c, int *left, int *right) {
return rc;
if(sscanf(r, "%d %d", left, right) != 2) {
c->last = "malformed volume response";
return rc;
if(sscanf(r, "%d %d", left, right) != 2) {
c->last = "malformed volume response";
- error(0, "error parsing response to 'volume': '%s'", r);
+
disorder_
error(0, "error parsing response to 'volume': '%s'", r);
return -1;
}
return 0;
return -1;
}
return 0;
@@
-1158,7
+1176,7
@@
int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) {
vec = split(r, &n, SPLIT_QUOTES, 0, 0);
if(n != 2) {
c->last = "malformed RTP address";
vec = split(r, &n, SPLIT_QUOTES, 0, 0);
if(n != 2) {
c->last = "malformed RTP address";
- error(0, "malformed rtp-address reply");
+
disorder_
error(0, "malformed rtp-address reply");
return -1;
}
*addressp = vec[0];
return -1;
}
*addressp = vec[0];
@@
-1307,11
+1325,11
@@
int disorder_schedule_get(disorder_client *c, const char *id,
return rc;
while(*lines) {
if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) {
return rc;
while(*lines) {
if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) {
- error(0, "invalid schedule-get reply: cannot split line");
+
disorder_
error(0, "invalid schedule-get reply: cannot split line");
return -1;
}
if(nbits != 2) {
return -1;
}
if(nbits != 2) {
- error(0, "invalid schedule-get reply: wrong number of fields");
+
disorder_
error(0, "invalid schedule-get reply: wrong number of fields");
return -1;
}
kvp_set(actiondatap, bits[0], bits[1]);
return -1;
}
kvp_set(actiondatap, bits[0], bits[1]);
@@
-1354,7
+1372,7
@@
int disorder_schedule_add(disorder_client *c,
action, key, value,
(char *)0);
} else
action, key, value,
(char *)0);
} else
- fatal(0, "unknown action '%s'", action);
+
disorder_
fatal(0, "unknown action '%s'", action);
va_end(ap);
return rc;
}
va_end(ap);
return rc;
}