Browse Source

Rename the list of torrents.

master
Richard Nyberg 19 years ago
parent
commit
f14c6c237e
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      btpd/btpd.c

+ 7
- 7
btpd/btpd.c View File

@@ -43,7 +43,7 @@ static struct event m_sigterm;
static struct event m_sigchld; static struct event m_sigchld;
static struct child_tq m_kids = BTPDQ_HEAD_INITIALIZER(m_kids); static struct child_tq m_kids = BTPDQ_HEAD_INITIALIZER(m_kids);
static unsigned m_ntorrents; static unsigned m_ntorrents;
static struct torrent_tq m_cm_list = BTPDQ_HEAD_INITIALIZER(m_cm_list);
static struct torrent_tq m_torrents = BTPDQ_HEAD_INITIALIZER(m_torrents);


unsigned long btpd_seconds; unsigned long btpd_seconds;


@@ -52,7 +52,7 @@ btpd_shutdown(void)
{ {
struct torrent *tp; struct torrent *tp;


tp = BTPDQ_FIRST(&m_cm_list);
tp = BTPDQ_FIRST(&m_torrents);
while (tp != NULL) { while (tp != NULL) {
struct torrent *next = BTPDQ_NEXT(tp, entry); struct torrent *next = BTPDQ_NEXT(tp, entry);
torrent_unload(tp); torrent_unload(tp);
@@ -105,7 +105,7 @@ heartbeat_cb(int sd, short type, void *arg)


btpd_seconds++; btpd_seconds++;


BTPDQ_FOREACH(tp, &m_cm_list, entry)
BTPDQ_FOREACH(tp, &m_torrents, entry)
cm_by_second(tp); cm_by_second(tp);


evtimer_add(&m_heartbeat, (& (struct timeval) { 1, 0 })); evtimer_add(&m_heartbeat, (& (struct timeval) { 1, 0 }));
@@ -114,21 +114,21 @@ heartbeat_cb(int sd, short type, void *arg)
void void
btpd_add_torrent(struct torrent *tp) btpd_add_torrent(struct torrent *tp)
{ {
BTPDQ_INSERT_TAIL(&m_cm_list, tp, entry);
BTPDQ_INSERT_TAIL(&m_torrents, tp, entry);
m_ntorrents++; m_ntorrents++;
} }


void void
btpd_del_torrent(struct torrent *tp) btpd_del_torrent(struct torrent *tp)
{ {
BTPDQ_REMOVE(&m_cm_list, tp, entry);
BTPDQ_REMOVE(&m_torrents, tp, entry);
m_ntorrents--; m_ntorrents--;
} }


const struct torrent_tq * const struct torrent_tq *
btpd_get_torrents(void) btpd_get_torrents(void)
{ {
return &m_cm_list;
return &m_torrents;
} }


unsigned unsigned
@@ -140,7 +140,7 @@ btpd_get_ntorrents(void)
struct torrent * struct torrent *
btpd_get_torrent(const uint8_t *hash) btpd_get_torrent(const uint8_t *hash)
{ {
struct torrent *tp = BTPDQ_FIRST(&m_cm_list);
struct torrent *tp = BTPDQ_FIRST(&m_torrents);
while (tp != NULL && bcmp(hash, tp->meta.info_hash, 20) != 0) while (tp != NULL && bcmp(hash, tp->meta.info_hash, 20) != 0)
tp = BTPDQ_NEXT(tp, entry); tp = BTPDQ_NEXT(tp, entry);
return tp; return tp;


Loading…
Cancel
Save