Menu
▾
▴
libaim-cvs — CVS log (as of 1-24-03) for libaim
You can subscribe to this list here.
| 2003 |
Jan
(2) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <ato...@us...> - 2003-02-26 18:17:00
|
Update of /cvsroot/libaim/libaim-ac/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7012/src
Modified Files:
Makefile.am Makefile.in aimsession.cpp server.cpp
Log Message:
- Updated configuration files so jaim (client example) and aimd (server
example) are compiled.
- aimsession.cpp: I did something, but I don't remember what.
- server.cpp: Fixed a few warnings.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am 26 Feb 2003 14:25:20 -0000 1.1.1.1
--- Makefile.am 26 Feb 2003 18:16:54 -0000 1.2
***************
*** 4,6 ****
libaim_la_LDFLAGS = -version-info 0:0:0
! CPPFLAGS = -I../include
--- 4,12 ----
libaim_la_LDFLAGS = -version-info 0:0:0
! bin_PROGRAMS = jaim aimd
! jaim_SOURCES = jaim.cpp
! jaim_LDADD = -laim
! aimd_SOURCES = server.cpp
! aimd_LDADD = -laim
!
! CPPFLAGS = -I../include -DDEBUG=$(DEBUG)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in 26 Feb 2003 14:25:20 -0000 1.1.1.1
--- Makefile.in 26 Feb 2003 18:16:54 -0000 1.2
***************
*** 90,94 ****
libaim_la_LDFLAGS = -version-info 0:0:0
! CPPFLAGS = -I../include
subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 90,100 ----
libaim_la_LDFLAGS = -version-info 0:0:0
! bin_PROGRAMS = jaim aimd
! jaim_SOURCES = jaim.cpp
! jaim_LDADD = -laim
! aimd_SOURCES = server.cpp
! aimd_LDADD = -laim
!
! CPPFLAGS = -I../include -DDEBUG=$(DEBUG)
subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 101,104 ****
--- 107,121 ----
flap.lo htmlparser.lo tlv.lo
libaim_la_OBJECTS = $(am_libaim_la_OBJECTS)
+ bin_PROGRAMS = jaim$(EXEEXT) aimd$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+
+ am_aimd_OBJECTS = server.$(OBJEXT)
+ aimd_OBJECTS = $(am_aimd_OBJECTS)
+ aimd_DEPENDENCIES =
+ aimd_LDFLAGS =
+ am_jaim_OBJECTS = jaim.$(OBJEXT)
+ jaim_OBJECTS = $(am_jaim_OBJECTS)
+ jaim_DEPENDENCIES =
+ jaim_LDFLAGS =
DEFS = @DEFS@
***************
*** 112,115 ****
--- 129,133 ----
@AMDEP_TRUE@ ./$(DEPDIR)/defaultaimlistener.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/flap.Plo ./$(DEPDIR)/htmlparser.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/jaim.Po ./$(DEPDIR)/server.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/tlv.Plo
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
***************
*** 122,128 ****
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(libaim_la_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libaim_la_SOURCES)
all: all-am
--- 140,146 ----
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(libaim_la_SOURCES) $(aimd_SOURCES) $(jaim_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libaim_la_SOURCES) $(aimd_SOURCES) $(jaim_SOURCES)
all: all-am
***************
*** 159,162 ****
--- 177,213 ----
libaim.la: $(libaim_la_OBJECTS) $(libaim_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libaim_la_LDFLAGS) $(libaim_la_OBJECTS) $(libaim_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+ f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ aimd$(EXEEXT): $(aimd_OBJECTS) $(aimd_DEPENDENCIES)
+ @rm -f aimd$(EXEEXT)
+ $(CXXLINK) $(aimd_LDFLAGS) $(aimd_OBJECTS) $(aimd_LDADD) $(LIBS)
+ jaim$(EXEEXT): $(jaim_OBJECTS) $(jaim_DEPENDENCIES)
+ @rm -f jaim$(EXEEXT)
+ $(CXXLINK) $(jaim_LDFLAGS) $(jaim_OBJECTS) $(jaim_LDADD) $(LIBS)
mostlyclean-compile:
***************
*** 171,174 ****
--- 222,227 ----
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlparser.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jaim.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlv.Plo@am__quote@
***************
*** 268,275 ****
check-am: all-am
check: check-am
! all-am: Makefile $(LTLIBRARIES)
installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir)
install: install-am
--- 321,330 ----
check-am: all-am
check: check-am
! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
! install-binPROGRAMS: install-libLTLIBRARIES
!
installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
install: install-am
***************
*** 299,304 ****
clean: clean-am
! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
! mostlyclean-am
distclean: distclean-am
--- 354,359 ----
clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
! clean-libtool mostlyclean-am
distclean: distclean-am
***************
*** 317,321 ****
install-data-am:
! install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
--- 372,376 ----
install-data-am:
! install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
install-info: install-info-am
***************
*** 334,350 ****
mostlyclean-libtool
! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
! .PHONY: GTAGS all all-am check check-am clean clean-generic \
! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags distdir dvi dvi-am info info-am install \
! install-am install-data install-data-am install-exec \
! install-exec-am install-info install-info-am \
! install-libLTLIBRARIES install-man install-strip installcheck \
! installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic mostlyclean-libtool tags uninstall \
! uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 389,407 ----
mostlyclean-libtool
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
! uninstall-libLTLIBRARIES
! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
! clean-generic clean-libLTLIBRARIES clean-libtool distclean \
! distclean-compile distclean-depend distclean-generic \
! distclean-libtool distclean-tags distdir dvi dvi-am info \
! info-am install install-am install-binPROGRAMS install-data \
! install-data-am install-exec install-exec-am install-info \
! install-info-am install-libLTLIBRARIES install-man \
! install-strip installcheck installcheck-am installdirs \
! maintainer-clean maintainer-clean-generic mostlyclean \
! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
! tags uninstall uninstall-am uninstall-binPROGRAMS \
! uninstall-info-am uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: aimsession.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/aimsession.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aimsession.cpp 26 Feb 2003 14:25:20 -0000 1.1.1.1
--- aimsession.cpp 26 Feb 2003 18:16:54 -0000 1.2
***************
*** 176,182 ****
{
#ifdef DEBUG
! /* debuggage */
! cerr << "Received MEM_REQUEST:\n";
! cerr << flap << "\n\n";
#endif
}
--- 176,182 ----
{
#ifdef DEBUG
! /* debuggage */
! cerr << "Received MEM_REQUEST:\n";
! cerr << flap << "\n\n";
#endif
}
Index: server.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/server.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** server.cpp 26 Feb 2003 14:25:20 -0000 1.1.1.1
--- server.cpp 26 Feb 2003 18:16:54 -0000 1.2
***************
*** 30,34 ****
unsigned int len = sizeof (struct sockaddr_in);
! int fd = accept (s, (struct sockaddr *)&sin, &len);
close (s);
return fd;
--- 30,34 ----
unsigned int len = sizeof (struct sockaddr_in);
! int fd = accept (s, (struct sockaddr *)&sin, &(int)len);
close (s);
return fd;
***************
*** 44,54 ****
flap.setChannelID (0x01);
flap.writeData (connectionAck, 4);
! flap.send( s );
cout << "Sending ... " << endl << flap << endl << endl;
! flap.receive(s);
cout << "Received ... " << endl << flap << endl << endl;
! flap.receive(s);
cout << "Received ... " << endl << flap << endl << endl;
--- 44,54 ----
flap.setChannelID (0x01);
flap.writeData (connectionAck, 4);
! flap.send(/* s */);
cout << "Sending ... " << endl << flap << endl << endl;
! flap.receive(/* s */);
cout << "Received ... " << endl << flap << endl << endl;
! flap.receive(/* s */);
cout << "Received ... " << endl << flap << endl << endl;
***************
*** 59,66 ****
const unsigned char plop[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
flap.writeData ( plop, 2);
! flap.send ( s );
cout << "Sending ... " << endl << flap << endl << endl;
! flap.receive(s);
cout << "Received ... " << endl << flap << endl << endl;
--- 59,66 ----
const unsigned char plop[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
flap.writeData ( plop, 2);
! flap.send (/* s */);
cout << "Sending ... " << endl << flap << endl << endl;
! flap.receive(/* s */);
cout << "Received ... " << endl << flap << endl << endl;
|
|
From: <ato...@us...> - 2003-02-26 18:17:00
|
Update of /cvsroot/libaim/libaim-ac
In directory sc8-pr-cvs1:/tmp/cvs-serv7012
Modified Files:
config.h.in configure
Log Message:
- Updated configuration files so jaim (client example) and aimd (server
example) are compiled.
- aimsession.cpp: I did something, but I don't remember what.
- server.cpp: Fixed a few warnings.
Index: config.h.in
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/config.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.h.in 26 Feb 2003 14:25:08 -0000 1.1.1.1
--- config.h.in 26 Feb 2003 18:16:53 -0000 1.2
***************
*** 1,59 ****
! /* config.h.in. Generated automatically from configure.in by autoheader. */
! /* Define if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
! /* Define if you have the <assert.h> header file. */
#undef HAVE_ASSERT_H
! /* Define if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
! /* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
! /* Define if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
! /* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
! /* Define if you have the <iomanip> header file. */
#undef HAVE_IOMANIP
! /* Define if you have the <iostream> header file. */
#undef HAVE_IOSTREAM
! /* Define if you have the <list> header file. */
#undef HAVE_LIST
! /* Define if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
! /* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
! /* Define if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
! /* Define if you have the <stdexcept> header file. */
#undef HAVE_STDEXCEPT
! /* Define if you have the <string> header file. */
#undef HAVE_STRING
! /* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
! /* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
! /* Define if you have the <time.h> header file. */
#undef HAVE_TIME_H
! /* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
--- 1,77 ----
! /* config.h.in. Generated from configure.in by autoheader. */
! /* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
! /* Define to 1 if you have the <assert.h> header file. */
#undef HAVE_ASSERT_H
! /* Define to 1 if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
! /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
! /* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
! /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
! /* Define to 1 if you have the <inttypes.h> header file. */
! #undef HAVE_INTTYPES_H
!
! /* Define to 1 if you have the <iomanip> header file. */
#undef HAVE_IOMANIP
! /* Define to 1 if you have the <iostream> header file. */
#undef HAVE_IOSTREAM
! /* Define to 1 if you have the <list> header file. */
#undef HAVE_LIST
! /* Define to 1 if you have the <memory.h> header file. */
! #undef HAVE_MEMORY_H
!
! /* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
! /* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
! /* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
! /* Define to 1 if you have the <stdexcept> header file. */
#undef HAVE_STDEXCEPT
! /* Define to 1 if you have the <stdint.h> header file. */
! #undef HAVE_STDINT_H
!
! /* Define to 1 if you have the <stdlib.h> header file. */
! #undef HAVE_STDLIB_H
!
! /* Define to 1 if you have the <string> header file. */
#undef HAVE_STRING
! /* Define to 1 if you have the <strings.h> header file. */
! #undef HAVE_STRINGS_H
!
! /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
! /* Define to 1 if you have the <sys/stat.h> header file. */
! #undef HAVE_SYS_STAT_H
!
! /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
! /* Define to 1 if you have the <time.h> header file. */
#undef HAVE_TIME_H
! /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
***************
*** 61,65 ****
#undef PACKAGE
! /* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
--- 79,98 ----
#undef PACKAGE
! /* Define to the address where bug reports for this package should be sent. */
! #undef PACKAGE_BUGREPORT
!
! /* Define to the full name of this package. */
! #undef PACKAGE_NAME
!
! /* Define to the full name and version of this package. */
! #undef PACKAGE_STRING
!
! /* Define to the one symbol short name of this package. */
! #undef PACKAGE_TARNAME
!
! /* Define to the version of this package. */
! #undef PACKAGE_VERSION
!
! /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
Index: configure
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure 26 Feb 2003 14:25:16 -0000 1.1.1.1
--- configure 26 Feb 2003 18:16:53 -0000 1.2
***************
*** 1,10 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.52.
#
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
# Find the correct PATH separator. Usually this is `:', but
[...7966 lines suppressed...]
{ (exit 0); exit 0; }
! EOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
# configure is writing to config.log, and then calls config.status.
--- 9570,9582 ----
esac
done
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
! _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+
# configure is writing to config.log, and then calls config.status.
|
|
From: <jon...@us...> - 2003-02-25 02:49:47
|
Update of /cvsroot/libaim/libaim/include In directory sc8-pr-cvs1:/tmp/cvs-serv20381/include Modified Files: aimsession.h flap.h Removed Files: bool.h Log Message: Code cleanup. Getting rid of that silly bool.h file. Compiles with -Wall now. Doesn't use deprecated iostream.h stuff anymore Index: aimsession.h =================================================================== RCS file: /cvsroot/libaim/libaim/include/aimsession.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** aimsession.h 17 Nov 2000 22:04:01 -0000 1.8 --- aimsession.h 25 Feb 2003 02:49:42 -0000 1.9 *************** *** 2,6 **** #define AIMSESSION_H ! #include <list.h> #include <string> #include <arpa/inet.h> --- 2,6 ---- #define AIMSESSION_H ! #include <list> #include <string> #include <arpa/inet.h> *************** *** 8,12 **** #include <aimlistener.h> #include <defaultaimlistener.h> - #include <bool.h> #include <flap.h> --- 8,11 ---- Index: flap.h =================================================================== RCS file: /cvsroot/libaim/libaim/include/flap.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flap.h 24 Jan 2003 23:35:35 -0000 1.10 --- flap.h 25 Feb 2003 02:49:42 -0000 1.11 *************** *** 19,23 **** #include <stdexcept> - #include <bool.h> #include <bits.h> --- 19,22 ---- *************** *** 43,55 **** /** ! * This buffer is used to hold the data in the flap packet. The initial size ! * of this buffer is 2046 bytes */ ! byte *dataBuffer; /** ! * The maximum ammount that we can store in data buffer without overflowing it */ ! int bufferCapacity; /** --- 42,54 ---- /** ! * The maximum ammount that we can store in data buffer without overflowing it */ ! int bufferCapacity; /** ! * This buffer is used to hold the data in the flap packet. The initial size ! * of this buffer is 2046 bytes */ ! byte *dataBuffer; /** --- bool.h DELETED --- |
|
From: <jon...@us...> - 2003-02-25 02:49:46
|
Update of /cvsroot/libaim/libaim
In directory sc8-pr-cvs1:/tmp/cvs-serv20381
Modified Files:
Makefile aimsession.cpp defaultaimlistener.cpp flap.cpp
htmlparser.cpp jaim.cpp server.cpp
Log Message:
Code cleanup. Getting rid of that silly bool.h file. Compiles with -Wall now. Doesn't use deprecated iostream.h stuff
anymore
Index: Makefile
===================================================================
RCS file: /cvsroot/libaim/libaim/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile 17 May 2000 20:52:38 -0000 1.5
--- Makefile 25 Feb 2003 02:49:40 -0000 1.6
***************
*** 4,8 ****
CC = g++
! CPPFLAGS = -c -g -I./include
OBJS = \
--- 4,8 ----
CC = g++
! CPPFLAGS = -c -g -I./include -Wall
OBJS = \
Index: aimsession.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/aimsession.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aimsession.cpp 25 Jan 2003 01:22:07 -0000 1.18
--- aimsession.cpp 25 Feb 2003 02:49:41 -0000 1.19
***************
*** 15,20 ****
--- 15,23 ----
#include <netdb.h>
+ #include <iostream>
#include <string>
+ using namespace std;
+
void AIMSession::handleSNACFamilyMessaging ( const FLAP::SNAC& snac, FLAP& flap ) {
const int INCOMING_IM = 0x07;
***************
*** 139,143 ****
flap.read8LV ( screenName );
! word type, tlvCount, warningLevel, userClass;
flap.readWord ( warningLevel );
--- 142,146 ----
flap.read8LV ( screenName );
! word tlvCount, warningLevel;
flap.readWord ( warningLevel );
***************
*** 264,268 ****
0xC5, 0xFA, 0x6B, 0x63, 0x69, 0x6C, 0xC3, 0x9F };
! for (int i=0; i<value.length(); i++)
password[i] = value[i] ^ mask[i % 16];
--- 267,271 ----
0xC5, 0xFA, 0x6B, 0x63, 0x69, 0x6C, 0xC3, 0x9F };
! for (string::size_type i=0; i<value.length(); i++)
password[i] = value[i] ^ mask[i % 16];
***************
*** 303,307 ****
FLAP flap;
! flap.setFileDescriptor (s, TRUE);
--- 306,310 ----
FLAP flap;
! flap.setFileDescriptor (s, true);
***************
*** 325,329 ****
*/
int passwordLen;
! const unsigned char *passowrd = getPassword( passwordLen );
flap.resetData();
flap.writeData (connectionAck, 4);
--- 328,332 ----
*/
int passwordLen;
! const unsigned char *password = getPassword( passwordLen );
flap.resetData();
flap.writeData (connectionAck, 4);
***************
*** 381,385 ****
*/
! int colonPos = newBOSServer.find (':');
if (colonPos != string::npos) {
--- 384,388 ----
*/
! string::size_type colonPos = newBOSServer.find (':');
if (colonPos != string::npos) {
***************
*** 410,414 ****
if ( ::connect (s, (struct sockaddr *)&sin, sizeof (struct sockaddr)) != 0 ) return 0;
! flap.setFileDescriptor (s, TRUE);
/*
--- 413,417 ----
if ( ::connect (s, (struct sockaddr *)&sin, sizeof (struct sockaddr)) != 0 ) return 0;
! flap.setFileDescriptor (s, true);
/*
***************
*** 447,451 ****
delete defaultAIMListener;
! if (password) delete password;
}
--- 450,454 ----
delete defaultAIMListener;
! delete password;
}
Index: defaultaimlistener.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/defaultaimlistener.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** defaultaimlistener.cpp 3 Jun 2000 14:09:10 -0000 1.3
--- defaultaimlistener.cpp 25 Feb 2003 02:49:41 -0000 1.4
***************
*** 2,5 ****
--- 2,8 ----
#include <buddyevent.h>
#include <aimsession.h>
+ #include <iostream>
+
+ using namespace std;
void DefaultAIMListener::simpleEventHandler ( AIMSession& session, int event, const string& message ) {
Index: flap.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/flap.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** flap.cpp 20 Nov 2000 16:03:44 -0000 1.10
--- flap.cpp 25 Feb 2003 02:49:41 -0000 1.11
***************
*** 2,7 ****
#include <tlv.h>
! #include <iostream.h>
! #include <iomanip.h>
#include <unistd.h>
--- 2,7 ----
#include <tlv.h>
! #include <iostream>
! #include <iomanip>
#include <unistd.h>
***************
*** 16,20 ****
return *this;
}
! FLAP& FLAP::setSeek ( int value, int whence = 0 ) {
int newValue;
--- 16,20 ----
return *this;
}
! FLAP& FLAP::setSeek ( int value, int whence ) {
int newValue;
***************
*** 55,59 ****
}
! FLAP::FLAP () : nextOutSequenceNumber(0), bufferCapacity(2046), closeFileDescOnDestroy ( false ) {
dataBuffer = new unsigned char[ bufferCapacity ];
resetData();
--- 55,63 ----
}
! FLAP::FLAP () :
! closeFileDescOnDestroy ( false ),
! bufferCapacity(2046),
! nextOutSequenceNumber(0)
! {
dataBuffer = new unsigned char[ bufferCapacity ];
resetData();
Index: htmlparser.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/htmlparser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** htmlparser.cpp 29 May 2000 04:08:01 -0000 1.3
--- htmlparser.cpp 25 Feb 2003 02:49:41 -0000 1.4
***************
*** 1,9 ****
#include <htmlparser.h>
!
! #include <iostream.h>
! #include <iomanip.h>
!
! #include <unistd.h>
! #include <ctype.h>
/*
--- 1,4 ----
#include <htmlparser.h>
! #include <string>
/*
***************
*** 11,15 ****
*/
! string HTMLParser::parse(const string& text) {
return text; // tempory fix till bryan fixes this
--- 6,10 ----
*/
! std::string HTMLParser::parse(const std::string& text) {
return text; // tempory fix till bryan fixes this
Index: jaim.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/jaim.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** jaim.cpp 20 Nov 2000 16:03:44 -0000 1.11
--- jaim.cpp 25 Feb 2003 02:49:41 -0000 1.12
***************
*** 4,8 ****
#include <string>
! #include <iostream.h>
#include <unistd.h>
#include <pwd.h>
--- 4,8 ----
#include <string>
! #include <iostream>
#include <unistd.h>
#include <pwd.h>
***************
*** 13,17 ****
public:
! static const char id[] = "$Id$";
void buddyEventHandler (AIMSession& session, const BuddyEvent& event) {
--- 13,17 ----
public:
! static const char* id;
void buddyEventHandler (AIMSession& session, const BuddyEvent& event) {
***************
*** 76,96 ****
};
! int main (int argc, char **argv) {
! /*
! * For some reason a switch statement won't work here.
! * aww, shucks. that's ok.
! */
try {
!
! if (argc == 1) {
Jaim jaim;
! } else if (argc == 2) {
Jaim jaim(argv[1]);
! } else if (argc == 3) {
Jaim jaim(argv[1], argv[2]);
}
! } catch (out_of_range e) {
cout << e.what() << endl;
}
--- 76,101 ----
};
! const char* Jaim::id = "$Id$";
! int main (int argc, char **argv) {
try {
! switch( argc )
! {
! case 1:
! {
Jaim jaim;
! }
! case 2:
! {
Jaim jaim(argv[1]);
! }
! case 3:
! {
Jaim jaim(argv[1], argv[2]);
+ }
}
!
! } catch (const exception& e) {
cout << e.what() << endl;
}
Index: server.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/server.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** server.cpp 18 May 2000 17:22:45 -0000 1.2
--- server.cpp 25 Feb 2003 02:49:41 -0000 1.3
***************
*** 1,3 ****
! #include <iostream.h>
#include <flap.h>
--- 1,3 ----
! #include <iostream>
#include <flap.h>
|
|
From: <ato...@us...> - 2003-01-25 01:22:10
|
Update of /cvsroot/libaim/libaim
In directory sc8-pr-cvs1:/tmp/cvs-serv28456
Modified Files:
aimsession.cpp
Log Message:
(heh heh, I forgot we were using C++ and I used fprintf insted of cerr...) More temporary debugging for AOL's memory-request FLAP.
Index: aimsession.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/aimsession.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** aimsession.cpp 25 Jan 2003 01:00:00 -0000 1.17
--- aimsession.cpp 25 Jan 2003 01:22:07 -0000 1.18
***************
*** 172,177 ****
case MEM_REQUEST:
{
/* debuggage */
! fprintf(stderr, "Received MEM_REQUEST.\n\n");
}
break;
--- 172,180 ----
case MEM_REQUEST:
{
+ #ifdef DEBUG
/* debuggage */
! cerr << "Received MEM_REQUEST:\n";
! cerr << flap << "\n\n";
! #endif
}
break;
|
|
From: <ato...@us...> - 2003-01-25 01:00:05
|
Update of /cvsroot/libaim/libaim
In directory sc8-pr-cvs1:/tmp/cvs-serv23461
Modified Files:
aimsession.cpp
Log Message:
Starting to fix the problem AIM intentionally created some time in '01 to block third-party OSCAR clients.
Index: aimsession.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim/aimsession.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aimsession.cpp 20 Nov 2000 16:03:44 -0000 1.16
--- aimsession.cpp 25 Jan 2003 01:00:00 -0000 1.17
***************
*** 123,128 ****
RATE_RESPONSE = 0x07,
PERSONAL_INFO_RESPONSE = 0x0f,
! MOTD = 0x13;
!
switch ( snac.subTypeID ) {
case SERVER_READY:
--- 123,129 ----
RATE_RESPONSE = 0x07,
PERSONAL_INFO_RESPONSE = 0x0f,
! MOTD = 0x13,
! MEM_REQUEST = 0x1f;
!
switch ( snac.subTypeID ) {
case SERVER_READY:
***************
*** 169,173 ****
}
break;
!
default:
cerr << "unknown snac type: " << snac.subTypeID << endl;
--- 170,179 ----
}
break;
! case MEM_REQUEST:
! {
! /* debuggage */
! fprintf(stderr, "Received MEM_REQUEST.\n\n");
! }
! break;
default:
cerr << "unknown snac type: " << snac.subTypeID << endl;
***************
*** 809,813 ****
}
! int AIMSession::sendICBMParameter ( ) {
flap.resetData();
--- 815,819 ----
}
! bool AIMSession::sendICBMParameter ( ) {
flap.resetData();
|
