Tue, 14 Oct 2003 04:35:46 +0000
[gaim-migrate @ 7836]
Correctly handle failed get info requests.
This should fix that bug that's assigned to me, and also the
problem SimGuy (and other people) have had where you need to
Get Info twice before it works.
| 2086 | 1 | /* |
| 2 | * Cookie Caching stuff. Adam wrote this, apparently just some | |
| 3 | * derivatives of n's SNAC work. I cleaned it up, added comments. | |
| 4 | * | |
| 5 | */ | |
| 6 | ||
| 7 | /* | |
| 8 | * I'm assuming that cookies are type-specific. that is, we can have | |
| 9 | * "1234578" for type 1 and type 2 concurrently. if i'm wrong, then we | |
| 10 | * lose some error checking. if we assume cookies are not type-specific and are | |
| 11 | * wrong, we get quirky behavior when cookies step on each others' toes. | |
| 12 | */ | |
| 13 | ||
| 14 | #define FAIM_INTERNAL | |
| 15 | #include <aim.h> | |
| 16 | ||
| 17 | /** | |
| 18 | * aim_cachecookie - appends a cookie to the cookie list | |
| 19 | * @sess: session to add to | |
| 20 | * @cookie: pointer to struct to append | |
| 21 | * | |
| 22 | * if cookie->cookie for type cookie->type is found, updates the | |
| 23 | * ->addtime of the found structure; otherwise adds the given cookie | |
| 24 | * to the cache | |
| 25 | * | |
| 26 | * returns -1 on error, 0 on append, 1 on update. the cookie you pass | |
| 27 | * in may be free'd, so don't count on its value after calling this! | |
| 28 | * | |
| 29 | */ | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
30 | faim_internal int aim_cachecookie(aim_session_t *sess, aim_msgcookie_t *cookie) |
| 2086 | 31 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
32 | aim_msgcookie_t *newcook; |
| 2086 | 33 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
34 | if (!sess || !cookie) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
35 | return -EINVAL; |
| 2086 | 36 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
37 | newcook = aim_checkcookie(sess, cookie->cookie, cookie->type); |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
38 | |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
39 | if (newcook == cookie) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
40 | newcook->addtime = time(NULL); |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
41 | return 1; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
42 | } else if (newcook) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
43 | aim_cookie_free(sess, newcook); |
| 2086 | 44 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
45 | cookie->addtime = time(NULL); |
| 2086 | 46 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
47 | cookie->next = sess->msgcookies; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
48 | sess->msgcookies = cookie; |
| 2086 | 49 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
50 | return 0; |
| 2086 | 51 | } |
| 52 | ||
| 53 | /** | |
| 54 | * aim_uncachecookie - grabs a cookie from the cookie cache (removes it from the list) | |
| 55 | * @sess: session to grab cookie from | |
| 56 | * @cookie: cookie string to look for | |
| 57 | * @type: cookie type to look for | |
| 58 | * | |
| 59 | * takes a cookie string and a cookie type and finds the cookie struct associated with that duple, removing it from the cookie list ikn the process. | |
| 60 | * | |
| 61 | * if found, returns the struct; if none found (or on error), returns NULL: | |
| 62 | */ | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
63 | faim_internal aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, fu8_t *cookie, int type) |
| 2086 | 64 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
65 | aim_msgcookie_t *cur, **prev; |
| 2086 | 66 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
67 | if (!cookie || !sess->msgcookies) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
68 | return NULL; |
| 2086 | 69 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
70 | for (prev = &sess->msgcookies; (cur = *prev); ) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
71 | if ((cur->type == type) && |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
72 | (memcmp(cur->cookie, cookie, 8) == 0)) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
73 | *prev = cur->next; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
74 | return cur; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
75 | } |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
76 | prev = &cur->next; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
77 | } |
| 2086 | 78 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
79 | return NULL; |
| 2086 | 80 | } |
| 81 | ||
| 82 | /** | |
| 83 | * aim_mkcookie - generate an aim_msgcookie_t *struct from a cookie string, a type, and a data pointer. | |
| 84 | * @c: pointer to the cookie string array | |
| 85 | * @type: cookie type to use | |
| 86 | * @data: data to be cached with the cookie | |
| 87 | * | |
| 88 | * returns NULL on error, a pointer to the newly-allocated cookie on | |
| 89 | * success. | |
| 90 | * | |
| 91 | */ | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
92 | faim_internal aim_msgcookie_t *aim_mkcookie(fu8_t *c, int type, void *data) |
| 2086 | 93 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
94 | aim_msgcookie_t *cookie; |
| 2086 | 95 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
96 | if (!c) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
97 | return NULL; |
| 2086 | 98 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
99 | if (!(cookie = calloc(1, sizeof(aim_msgcookie_t)))) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
100 | return NULL; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
101 | |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
102 | cookie->data = data; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
103 | cookie->type = type; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
104 | memcpy(cookie->cookie, c, 8); |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
105 | |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
106 | return cookie; |
| 2086 | 107 | } |
| 108 | ||
| 109 | /** | |
| 110 | * aim_checkcookie - check to see if a cookietuple has been cached | |
| 111 | * @sess: session to check for the cookie in | |
| 112 | * @cookie: pointer to the cookie string array | |
| 113 | * @type: type of the cookie to look for | |
| 114 | * | |
| 115 | * this returns a pointer to the cookie struct (still in the list) on | |
| 116 | * success; returns NULL on error/not found | |
| 117 | * | |
| 118 | */ | |
| 119 | ||
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
120 | faim_internal aim_msgcookie_t *aim_checkcookie(aim_session_t *sess, const fu8_t *cookie, int type) |
| 2086 | 121 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
122 | aim_msgcookie_t *cur; |
| 2086 | 123 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
124 | for (cur = sess->msgcookies; cur; cur = cur->next) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
125 | if ((cur->type == type) && |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
126 | (memcmp(cur->cookie, cookie, 8) == 0)) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
127 | return cur; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
128 | } |
| 2086 | 129 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
130 | return NULL; |
| 2086 | 131 | } |
| 132 | ||
| 133 | #if 0 /* debugging feature */ | |
|
4159
3b82b3117b24
[gaim-migrate @ 4387]
Mark Doliner <markdoliner@pidgin.im>
parents:
3952
diff
changeset
|
134 | faim_internal int aim_dumpcookie(aim_session_t *sess, aim_msgcookie_t *cookie) |
| 2086 | 135 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
136 | |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
137 | if (!cookie) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
138 | return -EINVAL; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
139 | |
|
4159
3b82b3117b24
[gaim-migrate @ 4387]
Mark Doliner <markdoliner@pidgin.im>
parents:
3952
diff
changeset
|
140 | faimdprintf(sess, 0, "\tCookie at %p: %d/%s with %p, next %p\n", cookie, |
|
3b82b3117b24
[gaim-migrate @ 4387]
Mark Doliner <markdoliner@pidgin.im>
parents:
3952
diff
changeset
|
141 | cookie->type, cookie->cookie, cookie->data, cookie->next); |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
142 | |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
143 | return 0; |
| 2086 | 144 | } |
| 145 | #endif | |
| 146 | ||
| 147 | /** | |
| 148 | * aim_cookie_free - free an aim_msgcookie_t struct | |
| 149 | * @sess: session to remove the cookie from | |
| 150 | * @cookiep: the address of a pointer to the cookie struct to remove | |
| 151 | * | |
| 152 | * this function removes the cookie *cookie from teh list of cookies | |
| 153 | * in sess, and then frees all memory associated with it. including | |
| 154 | * its data! if you want to use the private data after calling this, | |
| 155 | * make sure you copy it first. | |
| 156 | * | |
| 157 | * returns -1 on error, 0 on success. | |
| 158 | * | |
| 159 | */ | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
160 | faim_internal int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie) |
| 2086 | 161 | { |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
162 | aim_msgcookie_t *cur, **prev; |
| 2086 | 163 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
164 | if (!sess || !cookie) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
165 | return -EINVAL; |
| 2086 | 166 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
167 | for (prev = &sess->msgcookies; (cur = *prev); ) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
168 | if (cur == cookie) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
169 | *prev = cur->next; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
170 | else |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
171 | prev = &cur->next; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
172 | } |
| 2086 | 173 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
174 | free(cookie->data); |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
175 | free(cookie); |
| 2086 | 176 | |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
177 | return 0; |
| 2086 | 178 | } |
| 179 | ||
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
180 | /* XXX I hate switch */ |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
181 | faim_internal int aim_msgcookie_gettype(int reqclass) |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
182 | { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
183 | /* XXX: hokey-assed. needs fixed. */ |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
184 | switch(reqclass) { |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
185 | case AIM_CAPS_BUDDYICON: return AIM_COOKIETYPE_OFTICON; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
186 | case AIM_CAPS_VOICE: return AIM_COOKIETYPE_OFTVOICE; |
|
6871
ff864e84ca84
[gaim-migrate @ 7417]
Mark Doliner <markdoliner@pidgin.im>
parents:
4159
diff
changeset
|
187 | case AIM_CAPS_DIRECTIM: return AIM_COOKIETYPE_OFTIMAGE; |
|
2246
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
188 | case AIM_CAPS_CHAT: return AIM_COOKIETYPE_CHAT; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
189 | case AIM_CAPS_GETFILE: return AIM_COOKIETYPE_OFTGET; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
190 | case AIM_CAPS_SENDFILE: return AIM_COOKIETYPE_OFTSEND; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
191 | default: return AIM_COOKIETYPE_UNKNOWN; |
|
8ade8b7421af
[gaim-migrate @ 2256]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
192 | } |
| 2086 | 193 | } |