diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-02 13:46:10 +0300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-02 22:59:44 +0200 |
| commit | 64b125700eb472787eea6dba9d2ca29d8bc360d7 (patch) | |
| tree | 38bda65935a1e126b3d48b7b37e08c07d540aa9a /include/libssh | |
| parent | 6f650a61ca67c8f799a3c3d2f0c17bdd42136e5f (diff) | |
| download | libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.tar.gz libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.tar.xz libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.zip | |
channels: replaced bugged lists with ssh_list
(cherry picked from commit 6d8bb956c5caa48c2aba6713f067224650c3c1e1)
Conflicts:
src/channels.c
src/session.c
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/channels.h | 2 | ||||
| -rw-r--r-- | include/libssh/misc.h | 1 | ||||
| -rw-r--r-- | include/libssh/session.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/libssh/channels.h b/include/libssh/channels.h index 7ceb4403..4cdeb2b8 100644 --- a/include/libssh/channels.h +++ b/include/libssh/channels.h @@ -48,8 +48,6 @@ enum ssh_channel_state_e { }; struct ssh_channel_struct { - struct ssh_channel_struct *prev; - struct ssh_channel_struct *next; ssh_session session; /* SSH_SESSION pointer */ uint32_t local_channel; uint32_t local_window; diff --git a/include/libssh/misc.h b/include/libssh/misc.h index 9897c4eb..f19dc00f 100644 --- a/include/libssh/misc.h +++ b/include/libssh/misc.h @@ -58,6 +58,7 @@ struct ssh_timestamp { struct ssh_list *ssh_list_new(void); void ssh_list_free(struct ssh_list *list); struct ssh_iterator *ssh_list_get_iterator(const struct ssh_list *list); +struct ssh_iterator *ssh_list_find(const struct ssh_list *list, void *value); int ssh_list_append(struct ssh_list *list, const void *data); int ssh_list_prepend(struct ssh_list *list, const void *data); void ssh_list_remove(struct ssh_list *list, struct ssh_iterator *iterator); diff --git a/include/libssh/session.h b/include/libssh/session.h index 58df0d58..1d571f68 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -110,7 +110,7 @@ struct ssh_session_struct { struct ssh_crypto_struct *current_crypto; struct ssh_crypto_struct *next_crypto; /* next_crypto is going to be used after a SSH2_MSG_NEWKEYS */ - ssh_channel channels; /* linked list of channels */ + struct ssh_list *channels; /* linked list of channels */ int maxchannel; int exec_channel_opened; /* version 1 only. more info in channels1.c */ |