projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
apps
/
silcd
/
server_backup.c
diff --git
a/apps/silcd/server_backup.c
b/apps/silcd/server_backup.c
index 6b3d876a8e74999f6cf0c7be9696d10614773128..5888909c6a1a63d3716a345c9d98d22f82a2b8d7 100644
(file)
--- a/
apps/silcd/server_backup.c
+++ b/
apps/silcd/server_backup.c
@@
-27,7
+27,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_backup_done);
typedef struct {
SilcServerEntry server;
SilcIDIP ip;
typedef struct {
SilcServerEntry server;
SilcIDIP ip;
-
ui
nt16 port;
+
SilcUI
nt16 port;
bool local;
} SilcServerBackupEntry;
bool local;
} SilcServerBackupEntry;
@@
-35,20
+35,20
@@
typedef struct {
by backup router. */
typedef struct {
SilcIDIP ip;
by backup router. */
typedef struct {
SilcIDIP ip;
-
ui
nt16 port;
+
SilcUI
nt16 port;
SilcServerEntry server; /* Backup router that replaced the primary */
} SilcServerBackupReplaced;
/* Backup context */
struct SilcServerBackupStruct {
SilcServerBackupEntry *servers;
SilcServerEntry server; /* Backup router that replaced the primary */
} SilcServerBackupReplaced;
/* Backup context */
struct SilcServerBackupStruct {
SilcServerBackupEntry *servers;
-
ui
nt32 servers_count;
+
SilcUI
nt32 servers_count;
SilcServerBackupReplaced **replaced;
SilcServerBackupReplaced **replaced;
-
ui
nt32 replaced_count;
+
SilcUI
nt32 replaced_count;
};
typedef struct {
};
typedef struct {
-
ui
nt8 session;
+
SilcUI
nt8 session;
bool connected;
SilcServerEntry server_entry;
} SilcServerBackupProtocolSession;
bool connected;
SilcServerEntry server_entry;
} SilcServerBackupProtocolSession;
@@
-58,10
+58,10
@@
typedef struct {
SilcServer server;
SilcSocketConnection sock;
bool responder;
SilcServer server;
SilcSocketConnection sock;
bool responder;
-
ui
nt8 type;
-
ui
nt8 session;
+
SilcUI
nt8 type;
+
SilcUI
nt8 session;
SilcServerBackupProtocolSession *sessions;
SilcServerBackupProtocolSession *sessions;
-
ui
nt32 sessions_count;
+
SilcUI
nt32 sessions_count;
long start;
} *SilcServerBackupProtocolContext;
long start;
} *SilcServerBackupProtocolContext;
@@
-319,7
+319,7
@@
void silc_server_backup_send(SilcServer server,
SilcPacketType type,
SilcPacketFlags flags,
unsigned char *data,
SilcPacketType type,
SilcPacketFlags flags,
unsigned char *data,
-
ui
nt32 data_len,
+
SilcUI
nt32 data_len,
bool force_send,
bool local)
{
bool force_send,
bool local)
{
@@
-361,7
+361,7
@@
void silc_server_backup_send_dest(SilcServer server,
void *dst_id,
SilcIdType dst_id_type,
unsigned char *data,
void *dst_id,
SilcIdType dst_id_type,
unsigned char *data,
-
ui
nt32 data_len,
+
SilcUI
nt32 data_len,
bool force_send,
bool local)
{
bool force_send,
bool local)
{
@@
-400,7
+400,7
@@
void silc_server_backup_resume_router(SilcServer server,
SilcSocketConnection sock,
SilcPacketContext *packet)
{
SilcSocketConnection sock,
SilcPacketContext *packet)
{
-
ui
nt8 type, session;
+
SilcUI
nt8 type, session;
SilcServerBackupProtocolContext ctx;
int i, ret;
SilcServerBackupProtocolContext ctx;
int i, ret;
@@
-544,7
+544,7
@@
SILC_TASK_CALLBACK(silc_server_backup_connect_to_router)
connection is created. */
void silc_server_backup_reconnect(SilcServer server,
connection is created. */
void silc_server_backup_reconnect(SilcServer server,
- const char *ip,
ui
nt16 port,
+ const char *ip,
SilcUI
nt16 port,
SilcServerConnectRouterCallback callback,
void *context)
{
SilcServerConnectRouterCallback callback,
void *context)
{
@@
-682,7
+682,7
@@
SILC_TASK_CALLBACK(silc_server_backup_send_resumed)
SILC_PACKET_RESUME_ROUTER:
SILC_PACKET_RESUME_ROUTER:
- <
uint8 type> <ui
nt8 Session ID>
+ <
SilcUInt8 type> <SilcUI
nt8 Session ID>
<type> = the protocol opcode
<Session ID> = Identifier for this packet and any subsequent reply
<type> = the protocol opcode
<Session ID> = Identifier for this packet and any subsequent reply
@@
-867,7
+867,7
@@
SILC_TASK_CALLBACK_GLOBAL(silc_server_protocol_backup)
protocol->state++;
} else {
/* Responder of the protocol. */
protocol->state++;
} else {
/* Responder of the protocol. */
- SilcServerConfig
Section
Router *primary;
+ SilcServerConfigRouter *primary;
/* We should have received START or START_GLOBAL packet */
if (ctx->type != SILC_SERVER_BACKUP_START &&
/* We should have received START or START_GLOBAL packet */
if (ctx->type != SILC_SERVER_BACKUP_START &&
@@
-882,7
+882,7
@@
SILC_TASK_CALLBACK_GLOBAL(silc_server_protocol_backup)
/* Connect to the primary router that was down that is now supposed
to be back online. We send the CONNECTED packet after we've
established the connection to the primary router. */
/* Connect to the primary router that was down that is now supposed
to be back online. We send the CONNECTED packet after we've
established the connection to the primary router. */
- primary = silc_server_config_get_primary_router(server
->config
);
+ primary = silc_server_config_get_primary_router(server);
if (primary && server->backup_primary) {
silc_server_backup_reconnect(server,
primary->host, primary->port,
if (primary && server->backup_primary) {
silc_server_backup_reconnect(server,
primary->host, primary->port,
@@
-975,7
+975,7
@@
SILC_TASK_CALLBACK_GLOBAL(silc_server_protocol_backup)
to next state. */
if (server->router &&
!(server->router->data.status & SILC_IDLIST_STATUS_DISABLED) &&
to next state. */
if (server->router &&
!(server->router->data.status & SILC_IDLIST_STATUS_DISABLED) &&
- silc_server_config_is_primary_route(server
->config
)) {
+ silc_server_config_is_primary_route(server)) {
/* We'll wait for RESUMED packet */
protocol->state = SILC_PROTOCOL_STATE_END;
break;
/* We'll wait for RESUMED packet */
protocol->state = SILC_PROTOCOL_STATE_END;
break;