stv0g/telegram-purple
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve comments and logging messages

Browse source
This commit is contained in:
mjentsch 2015-11-16 15:47:32 +01:00
parent 8ee4f680c2
commit 6e210b8417
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
telegram-base.c
View file

@ -105,6 +105,8 @@ int read_pubkey_file (const char *name, struct rsa_pubkey *dst) {
dst->e = e;
dst->n_len = n_len;
dst->n_raw = n_raw;
info ("read pubkey file: n_len=%u e=%u", n_len, e);
return 1;
}
@ -138,6 +140,7 @@ void read_state_file (struct tgl_state *TLS) {
bl_do_set_pts (TLS, pts);
bl_do_set_qts (TLS, qts);
bl_do_set_date (TLS, date);
info ("read state file: seq=%d pts=%d qts=%d date=%d", seq, pts, qts, date);
}
void write_state_file (struct tgl_state *TLS) {
@ -166,7 +169,8 @@ void write_state_file (struct tgl_state *TLS) {
x[4] = wseq;
x[5] = wdate;
assert (write (state_file_fd, x, 24) == 24);
close (state_file_fd);
close (state_file_fd);
info ("wrote state file: wpts=%d wqts=%d wseq=%d wdate=%d", wpts, wqts, wseq, wdate);
}
static gboolean write_files_gw (gpointer data) {
@ -225,6 +229,7 @@ void write_auth_file (struct tgl_state *TLS) {
assert (write (auth_file_fd, &TLS->our_id, 4) == 4);
close (auth_file_fd);
info ("wrote auth file: magic=%d max_dc_num=%d dc_working_num=%d", x, TLS->max_dc_num, TLS->dc_working_num);
}
void read_dc (struct tgl_state *TLS, int auth_file_fd, int id, unsigned ver) {
@ -245,6 +250,7 @@ void read_dc (struct tgl_state *TLS, int auth_file_fd, int id, unsigned ver) {
bl_do_dc_option (TLS, 0, id, "DC", 2, ip, l, port);
bl_do_set_auth_key (TLS, id, auth_key);
bl_do_dc_signed (TLS, id);
debug ("read dc: id=%d", id);
}
int tgp_error_if_false (struct tgl_state *TLS, int val, const char *cause, const char *msg) {
@ -258,6 +264,7 @@ int tgp_error_if_false (struct tgl_state *TLS, int val, const char *cause, const
}
void empty_auth_file (struct tgl_state *TLS) {
info ("initializing empty auth file");
if (TLS->test_mode) {
bl_do_dc_option (TLS, 0, 1, "", 0, TG_SERVER_TEST_1, strlen (TG_SERVER_TEST_1), 443);
bl_do_dc_option (TLS, 0, 2, "", 0, TG_SERVER_TEST_2, strlen (TG_SERVER_TEST_2), 443);
@ -315,6 +322,7 @@ void read_auth_file (struct tgl_state *TLS) {
bl_do_set_our_id (TLS, TGL_MK_USER (our_id));
}
close (auth_file_fd);
info ("read auth file: dcs=%d dc_working_num=%d our_id=%d", x, dc_working_num, our_id);
}
void write_secret_chat (tgl_peer_t *_P, void *extra) {
@ -343,6 +351,7 @@ void write_secret_chat (tgl_peer_t *_P, void *extra) {
assert (write (fd, &P->in_seq_no, 4) == 4);
assert (write (fd, &P->last_in_seq_no, 4) == 4);
assert (write (fd, &P->out_seq_no, 4) == 4);
debug ("wrote secret chat: %s, state=%d, in_seq_no=%d, out_seq_no=%d", P->print_name, P->state, P->in_seq_no, P->out_seq_no);
}
void write_secret_chat_file (struct tgl_state *TLS) {
@ -368,6 +377,7 @@ void write_secret_chat_file (struct tgl_state *TLS) {
lseek (secret_chat_fd, 8, SEEK_SET);
assert (write (secret_chat_fd, &y[1], 4) == 4);
close (secret_chat_fd);
info ("wrote secret chat file: %d chats written.", y[1]);
}
void read_secret_chat (struct tgl_state *TLS, int fd, int v) {
@ -378,7 +388,7 @@ void read_secret_chat (struct tgl_state *TLS, int fd, int v) {
static unsigned char sha[20];
assert (read (fd, &id, 4) == 4);
assert (read (fd, &l, 4) == 4);
assert (l > 0 && l < 1000);
assert (l > 0 && l < 999);
assert (read (fd, s, l) == l);
assert (read (fd, &user_id, 4) == 4);
assert (read (fd, &admin_id, 4) == 4);
@ -401,9 +411,12 @@ void read_secret_chat (struct tgl_state *TLS, int fd, int v) {
assert (read (fd, &out_seq_no, 4) == 4);
}
s[l] = '\0';
debug ("read secret chat: %s, state=%d, in_seq_no=%d, last_in_seq_no=%d, out_seq_no=%d",
s, state, in_seq_no, last_in_seq_no, out_seq_no);
bl_do_encr_chat (TLS, id, &access_hash, &date, &admin_id, &user_id, key, NULL, sha, &state, &ttl,
&layer, &in_seq_no, &last_in_seq_no, &out_seq_no, &key_fingerprint, TGLECF_CREATE | TGLECF_CREATED,
s, l);
&layer, &in_seq_no, &last_in_seq_no, &out_seq_no, &key_fingerprint, TGLECF_CREATE | TGLECF_CREATED,
s, l);
}
void read_secret_chat_file (struct tgl_state *TLS) {
@ -425,10 +438,12 @@ void read_secret_chat_file (struct tgl_state *TLS) {
assert (v == 0 || v == 1 || v == 2); // version
assert (read (secret_chat_fd, &x, 4) == 4);
assert (x >= 0);
int cnt = x;
while (x -- > 0) {
read_secret_chat (TLS, secret_chat_fd, v);
}
close (secret_chat_fd);
info ("read secret chat file: %d chats read", cnt);
}
gchar *get_config_dir (char const *username) {

16
telegram-purple.c
View file

@ -125,16 +125,15 @@ static void update_user_handler (struct tgl_state *TLS, struct tgl_user *user, u
}
if (flags & TGL_UPDATE_CREATED) {
// new user was allocated
// new user was allocated, fetch the corresponding buddy from the buddy list
PurpleBuddy *buddy = tgp_blist_buddy_find (TLS, user->id);
// fetch buddies that are still stored in the old naming scheme
// the buddy doesn't exist, if it is stored in the legacy naming format find and migrate it. This
// should only happen when making the switch from a version < 1.2.2 to a version >= 1.2.2
if (! buddy) {
char *id = g_strdup_printf ("%d", tgl_get_peer_id (user->id));
buddy = purple_find_buddy (tg_get_acc (TLS), id);
g_free (id);
// migrate the old buddy to the new format
if (buddy) {
debug ("migrating buddy from old name %s to %s", purple_buddy_get_name (buddy), user->print_name);
buddy = tgp_blist_buddy_migrate (TLS, buddy, user);
@ -591,7 +590,7 @@ static void tgprpl_login (PurpleAccount * acct) {
tgl_set_verbosity (TLS, 4);
if (global_pk_loaded) {
debug ("using global pubkey");
info ("using global pubkey");
tgl_set_rsa_key_direct (TLS, pubkey.e, pubkey.n_len, pubkey.n_raw);
} else {
char *user_pk_path = get_user_pk_path ();
@ -599,10 +598,10 @@ static void tgprpl_login (PurpleAccount * acct) {
gboolean user_pk_loaded = read_pubkey_file (user_pk_path, &pubkey);
if (user_pk_loaded) {
debug ("using local pubkey");
info ("using local pubkey");
tgl_set_rsa_key_direct (TLS, pubkey.e, pubkey.n_len, pubkey.n_raw);
} else {
debug ("both didn't work. abort.");
failure ("both didn't work. abort.");
char *cause = g_strdup_printf (_("Unable to sign on as %s: pubkey not found."),
purple_account_get_username (acct));
purple_connection_error_reason (gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, cause);
@ -624,8 +623,7 @@ static void tgprpl_login (PurpleAccount * acct) {
tgl_set_net_methods (TLS, &tgp_conn_methods);
tgl_set_timer_methods (TLS, &tgp_timers);
tgl_set_callback (TLS, &tgp_callback);
tgl_register_app_id (TLS, TGP_APP_ID, TGP_APP_HASH);
tgl_register_app_id (TLS, TGP_APP_ID, TGP_APP_HASH);
tgl_init (TLS);
if (! tgp_startswith (purple_account_get_username (acct), "+")) {