projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
apps
/
silcd
/
protocol.h
diff --git
a/apps/silcd/protocol.h
b/apps/silcd/protocol.h
index c2b30e5ef0e82dab610a53f273137047a6896325..3c184abce2ae2363f1193d1f1dd38ee316037258 100644
(file)
--- a/
apps/silcd/protocol.h
+++ b/
apps/silcd/protocol.h
@@
-2,15
+2,14
@@
protocol.h
protocol.h
- Author: Pekka Riikonen <priikone@
poseidon.pspt.fi
>
+ Author: Pekka Riikonen <priikone@
silcnet.org
>
- Copyright (C) 1997 - 200
1
Pekka Riikonen
+ Copyright (C) 1997 - 200
3
Pekka Riikonen
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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; version 2 of the License.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@
-44,10
+43,10
@@
typedef struct {
void *dest_id;
SilcIdType dest_id_type;
void *dest_id;
SilcIdType dest_id_type;
- /* Pointer
to the configurations.
*/
-
void *
cconfig;
-
void *
sconfig;
-
void *
rconfig;
+ /* Pointer
s to the configurations. Defined only when responder is TRUE
*/
+
SilcServerConfigRef
cconfig;
+
SilcServerConfigRef
sconfig;
+
SilcServerConfigRef
rconfig;
SilcTask timeout_task;
SilcPacketContext *packet;
SilcTask timeout_task;
SilcPacketContext *packet;
@@
-71,22
+70,22
@@
typedef struct {
/* Authentication method and data if we alreay know it. This is filled
before starting the protocol if we know the authentication data.
Otherwise these are and remain NULL. Used when we are initiating. */
/* Authentication method and data if we alreay know it. This is filled
before starting the protocol if we know the authentication data.
Otherwise these are and remain NULL. Used when we are initiating. */
-
ui
nt32 auth_meth;
+
SilcUI
nt32 auth_meth;
void *auth_data;
void *auth_data;
-
ui
nt32 auth_data_len;
+
SilcUI
nt32 auth_data_len;
/* Destinations ID from KE protocol context */
void *dest_id;
SilcIdType dest_id_type;
/* Destinations ID from KE protocol context */
void *dest_id;
SilcIdType dest_id_type;
- /* Pointer
to the configurations.
*/
-
void *
cconfig;
-
void *
sconfig;
-
void *
rconfig;
+ /* Pointer
s to the configurations. Defined only when responder is TRUE
*/
+
SilcServerConfigRef
cconfig;
+
SilcServerConfigRef
sconfig;
+
SilcServerConfigRef
rconfig;
SilcTask timeout_task;
SilcPacketContext *packet;
SilcTask timeout_task;
SilcPacketContext *packet;
-
ui
nt16 conn_type;
+
SilcUI
nt16 conn_type;
} SilcServerConnAuthInternalContext;
/* Internal context for the rekey protocol */
} SilcServerConnAuthInternalContext;
/* Internal context for the rekey protocol */
@@
-98,6
+97,7
@@
typedef struct {
bool pfs; /* TRUE if PFS is to be used */
SilcSKE ske; /* Defined if PFS is used */
SilcPacketContext *packet;
bool pfs; /* TRUE if PFS is to be used */
SilcSKE ske; /* Defined if PFS is used */
SilcPacketContext *packet;
+ SilcTask timeout_task;
} SilcServerRekeyInternalContext;
/* Prototypes */
} SilcServerRekeyInternalContext;
/* Prototypes */