pidgin: src/protocols/oscar/ft.c comparison

comparison src/protocols/oscar/ft.c @ 4870:773135edda4a

[gaim-migrate @ 5200] Added 3-stage typing notification for oscar direct connect (incoming and outgoing). Previously Gaim only had "typing" and "no text entered." I added support for "text typed." Made Gaim correctly recognize and send the auto-response flag for direct connections. So messages will probably show up as "AUTO-REPLY" for you and your amigo. Have gaim save your blist after recieving someone's icon, which is a bugfix from my code from last night, I think. Fixed a memleak in icon.c thanks to Nathan Walp. committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Sun, 23 Mar 2003 07:38:55 +0000
parents	edfe778868e2
children	26837f462a66

comparison

equal deleted inserted replaced

-:e6c7d67c1f3a
+:773135edda4a
 /**
 * Send client-to-client typing notification over an established direct connection.
 *
 * @param sess The session.
 * @param conn The already-connected ODC connection.
-* @param typing If true, notify user has started typing; if false, notify user has stopped.
+* @param typing If 0x0002, sends a "typing" message, 0x0001 sends "typed," and
+*        0x0000 sends "stopped."
 * @return Return 0 if no errors, otherwise return the error number.
 */
 faim_export int aim_odc_send_typing(aim_session_t *sess, aim_conn_t *conn, int typing)
 {
 	struct aim_odc_intdata *intdata = (struct aim_odc_intdata *)conn->internal;
 	int hdrlen = 0x44;
 	if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS))
 		return -EINVAL;
-	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x01, 0)))
+	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0001, 0)))
 		return -ENOMEM;
 	memcpy(fr->hdr.rend.magic, "ODC2", 4);
 	fr->hdr.rend.hdrlen = hdrlen;
 	if (!(hdr = calloc(1, hdrlen))) {
 	aimbs_put32(hdrbs, 0x00000000);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_put16(hdrbs, 0x0000);
-	/* flags -- 0x000e for "started typing", 0x0002 for "stopped typing */
+	if (typing == 0x0002)
-	aimbs_put16(hdrbs, ( typing ? 0x000e : 0x0002));
+		aimbs_put16(hdrbs, 0x0002 | 0x0008);
+	else if (typing == 0x0001)
+		aimbs_put16(hdrbs, 0x0002 | 0x0004);
+	else
+		aimbs_put16(hdrbs, 0x0002);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_putraw(hdrbs, sess->sn, strlen(sess->sn));
 * @param sess The session.
 * @param conn The already-connected ODC connection.
 * @param msg Null-terminated string to send.
 * @param len The length of the message to send, including binary data.
 * @param encoding 0 for ascii, 2 for Unicode, 3 for ISO 8859-1.
+* @param isawaymsg 0 if this is not an auto-response, 1 if it is.
 * @return Return 0 if no errors, otherwise return the error number.
 */
-faim_export int aim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *msg, int len, int encoding)
+faim_export int aim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *msg, int len, int encoding, int isawaymsg)
 {
 	aim_frame_t *fr;
 	aim_bstream_t *hdrbs;
 	struct aim_odc_intdata *intdata = (struct aim_odc_intdata *)conn->internal;
 	int hdrlen = 0x44;
 	aimbs_put32(hdrbs, len);
 	aimbs_put16(hdrbs, encoding);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_put16(hdrbs, 0x0000);
-	/* flags -- 0x000e for "started typing", 0x0002 for "stopped typing, 0x0000 for message */
+	/* flags - used for typing notification and to mark if this is an away message */
-	aimbs_put16(hdrbs, 0x0000);
+	aimbs_put16(hdrbs, 0x0000 | isawaymsg);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_put16(hdrbs, 0x0000);
 	aimbs_putraw(hdrbs, sess->sn, strlen(sess->sn));
 * @return Return 0 if no errors, otherwise return the error number.
 */
 static int handlehdr_odc(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *frr, aim_bstream_t *bs)
 {
 	aim_frame_t fr;
+	int ret = 0;
 	aim_rxcallback_t userfunc;
 	fu32_t payloadlength;
 	fu16_t flags, encoding;
 	char *snptr = NULL;
 	/* XXX - create an aimbs_getnullstr function? */
 	snptr = aimbs_getstr(bs, MAXSNLEN);
 	faimdprintf(sess, 2, "faim: OFT frame: handlehdr_odc: %04x / %04x / %s\n", payloadlength, flags, snptr);
-	if (flags & 0x0002) {
+	if (flags & 0x0008) {
-		int ret = 0;
+		if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING)))
+			ret = userfunc(sess, &fr, snptr, 2);
-		if (flags & 0x000c) {
+	} else if (flags & 0x0004) {
-			if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING)))
+		if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING)))
-				ret = userfunc(sess, &fr, snptr, 1);
+			ret = userfunc(sess, &fr, snptr, 1);
-			return ret;
+	} else {
-		}
 		if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING)))
 			ret = userfunc(sess, &fr, snptr, 0);
+	}
-		return ret;
+	if (payloadlength) {
-	} else if (((flags & 0x000f) == 0x0000) && payloadlength) {
+		char *msg;
-		char *msg, *msg2;
-		int ret = 0;
 		int recvd = 0;
-		int i;
+		int i, isawaymsg;
+		isawaymsg = flags & 0x0001;
 		if (!(msg = calloc(1, payloadlength+1)))
-			return -1;
+			return -ENOMEM;
-		msg2 = msg;
 		while (payloadlength - recvd) {
 			if (payloadlength - recvd >= 1024)
-				i = aim_recv(conn->fd, msg2, 1024);
+				i = aim_recv(conn->fd, &msg[recvd], 1024);
 			else
-				i = aim_recv(conn->fd, msg2, payloadlength - recvd);
+				i = aim_recv(conn->fd, &msg[recvd], payloadlength - recvd);
 			if (i <= 0) {
 				free(msg);
 				return -1;
 			}
 			recvd = recvd + i;
-			msg2 = msg2 + i;
 			if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_IMAGETRANSFER)))
-				userfunc(sess, &fr, snptr, (double)recvd / payloadlength);
+				ret = userfunc(sess, &fr, snptr, (double)recvd / payloadlength);
 		}
-		if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING)) )
+		if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING)))
-			ret = userfunc(sess, &fr, snptr, msg, payloadlength, encoding);
+			ret = userfunc(sess, &fr, snptr, msg, payloadlength, encoding, isawaymsg);
 		free(msg);
+	}
-		return ret;
-	}
+	return ret;
-	return 0;
 }
 /**
 * Creates a listener socket so the other dude can connect to us.
 *

Mercurial > pidgin

comparison src/protocols/oscar/ft.c @ 4870:773135edda4a