markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Use the subid when disabling a subproxy instead of the id

master
Con Kolivas 10 years ago
parent
a98d510f9f
commit
14a7ec05e2
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/generator.c

6
src/generator.c
Unescape View File

@ -943,7 +943,7 @@ static void disable_subproxy(gdata_t *gdata, proxy_instance_t *proxi, proxy_inst
mutex_lock(&proxi->proxy_lock); mutex_lock(&proxi->proxy_lock);
subproxy->disabled = true; subproxy->disabled = true;
/* Make sure subproxy is still in the list */ /* Make sure subproxy is still in the list */
subproxy = __subproxy_by_id(proxi, subproxy->id); subproxy = __subproxy_by_id(proxi, subproxy->subid);
if (subproxy) { if (subproxy) {
Close(subproxy->cs->fd); Close(subproxy->cs->fd);
HASH_DEL(proxi->subproxies, subproxy); HASH_DEL(proxi->subproxies, subproxy);
@ -1279,12 +1279,12 @@ static void send_subscribe(ckpool_t *ckp, proxy_instance_t *proxi)
free(buf); free(buf);
} }
static proxy_instance_t *subproxy_by_id(proxy_instance_t *proxy, const int id) static proxy_instance_t *subproxy_by_id(proxy_instance_t *proxy, const int subid)
{ {
proxy_instance_t *subproxy; proxy_instance_t *subproxy;
mutex_lock(&proxy->proxy_lock); mutex_lock(&proxy->proxy_lock);
subproxy = __subproxy_by_id(proxy, id); subproxy = __subproxy_by_id(proxy, subid);
if (subproxy && subproxy->disabled) if (subproxy && subproxy->disabled)
subproxy = NULL; subproxy = NULL;
mutex_unlock(&proxy->proxy_lock); mutex_unlock(&proxy->proxy_lock);

Write Preview
Loading…
Cancel
Save