diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-02 13:46:10 +0300 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-02 13:46:10 +0300 |
| commit | 6d8bb956c5caa48c2aba6713f067224650c3c1e1 (patch) | |
| tree | 00ab42ac7c63dc6e030f844f93cfb58999477bb2 /include | |
| parent | 3eece8ac0b107a7df8d95325ef17ed19d6429e75 (diff) | |
| download | libssh-6d8bb956c5caa48c2aba6713f067224650c3c1e1.tar.gz libssh-6d8bb956c5caa48c2aba6713f067224650c3c1e1.tar.xz libssh-6d8bb956c5caa48c2aba6713f067224650c3c1e1.zip | |
channels: replaced bugged lists with ssh_list
cherry-picked from 0aef5f
Conflicts:
src/session.c
Diffstat (limited to 'include')
| -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 14db3f86..624a3adf 100644 --- a/include/libssh/channels.h +++ b/include/libssh/channels.h @@ -49,8 +49,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 be013372..c05a5870 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 3914326b..d251e7e3 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -119,7 +119,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 */ |