comparison libgaim/protocols/oscar/oscar.h @ 15107:f41cd6f78c60

[gaim-migrate @ 17892] Use GHashTable and GQueue instead of GSList in a few places in oscar. The speed improvements probably won't be noticeable. 4 files changed, 48 insertions(+), 106 deletions(-) committer: Tailor Script <[e-mail]>

15106:b2b0839f57d0

	guint16 type;
	guint16 subtype;
	guint16 seqnum; /**< The sequence number of most recent outgoing packet. */
	GSList *groups;
	GSList *rateclasses; /* Contains nodes of struct rateclass. */
	/* TODO: Maybe use a GHashTable for rateclasses */

	GSList *queued_snacs; /**< Contains QueuedSnacs. */
	guint outgoing_timeout;
	/* TODO: Maybe use a GQueue for outgoing_snacs */

	void *internal; /* internal conn-specific libfaim data */
};

struct _IcbmCookie

		time_t timestamp;
		gboolean waiting_for_ack;
		gboolean in_transaction;
	} ssi;

	/* TODO: Implement this as a HashTable for HUGE speed improvement! */
	GSList *handlerlist;

	/** A linked list containing FlapConnections. */
	GSList *oscar_connections;

	/** A linked list containing PeerConnections. */

int aim_send_login(OscarData *, FlapConnection *, const char *, const char *, ClientInfo *, const char *key);
/* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);

void aim_cleansnacs(OscarData *, int maxage);

int oscar_data_addhandler(OscarData *od, guint16 family, guint16 type, aim_rxcallback_t newhandler, guint16 flags);
void aim_clearhandlers(OscarData *od);

/* flap_connection.c */
FlapConnection *flap_connection_new(OscarData *, int type);
void flap_connection_close(OscarData *od, FlapConnection *conn);
void flap_connection_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message);

int byte_stream_putraw(ByteStream *bs, const guint8 *v, int len);
int byte_stream_putstr(ByteStream *bs, const char *str);
int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len);
int byte_stream_putcaps(ByteStream *bs, guint32 caps);

/* rxhandlers.c */
aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 type);

/*
 * Generic SNAC structure.  Rarely if ever used.
 */
typedef struct aim_snac_s {
	aim_snacid_t id;

struct chatsnacinfo {
	guint16 exchange;
	char name[128];
	guint16 instance;
};

struct snacpair {
	guint16 group;
	guint16 subtype;
};

struct rateclass {
	guint16 classid;
	guint32 windowsize;

	guint32 limit;
	guint32 disconnect;
	guint32 current;
	guint32 max;
	guint8 unknown[5]; /* only present in versions >= 3 */
	GSList *members; /* Contains node of struct snacpair */
	/* TODO: Maybe use a GHashTable for members */

	struct timeval last; /**< The time when we last sent a SNAC of this rate class. */
};

int aim_cachecookie(OscarData *od, IcbmCookie *cookie);

15107:f41cd6f78c60

	guint16 type;
	guint16 subtype;
	guint16 seqnum; /**< The sequence number of most recent outgoing packet. */
	GSList *groups;
	GSList *rateclasses; /* Contains nodes of struct rateclass. */

	GQueue *queued_snacs; /**< Contains QueuedSnacs. */
	guint queued_timeout;

	void *internal; /* internal conn-specific libfaim data */
};

struct _IcbmCookie

		time_t timestamp;
		gboolean waiting_for_ack;
		gboolean in_transaction;
	} ssi;

	GHashTable *handlerlist;

	/** A linked list containing FlapConnections. */
	GSList *oscar_connections;

	/** A linked list containing PeerConnections. */

int aim_send_login(OscarData *, FlapConnection *, const char *, const char *, ClientInfo *, const char *key);
/* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);

void aim_cleansnacs(OscarData *, int maxage);

void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);

/* flap_connection.c */
FlapConnection *flap_connection_new(OscarData *, int type);
void flap_connection_close(OscarData *od, FlapConnection *conn);
void flap_connection_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message);

int byte_stream_putraw(ByteStream *bs, const guint8 *v, int len);
int byte_stream_putstr(ByteStream *bs, const char *str);
int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len);
int byte_stream_putcaps(ByteStream *bs, guint32 caps);

/*
 * Generic SNAC structure.  Rarely if ever used.
 */
typedef struct aim_snac_s {
	aim_snacid_t id;

struct chatsnacinfo {
	guint16 exchange;
	char name[128];
	guint16 instance;
};

struct rateclass {
	guint16 classid;
	guint32 windowsize;

	guint32 limit;
	guint32 disconnect;
	guint32 current;
	guint32 max;
	guint8 unknown[5]; /* only present in versions >= 3 */
	GHashTable *members; /* Key is family and subtype, value is TRUE. */

	struct timeval last; /**< The time when we last sent a SNAC of this rate class. */
};

int aim_cachecookie(OscarData *od, IcbmCookie *cookie);