Changes in / [f329dfc:e01ff50]
- Files:
-
- 3 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rf329dfc re01ff50 10 10 11 11 # Program variables 12 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o13 headers = $(wildcard *.h lib/*.h protocols/*.h)12 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) 13 headers = bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/json.h lib/json_util.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/account.h protocols/bee.h protocols/ft.h protocols/nogaim.h 14 14 subdirs = lib protocols 15 15 16 OUTFILE = bitlbee 16 ifeq ($(TARGET),i586-mingw32msvc) 17 objects += win32.o 18 LDFLAGS+=-lws2_32 19 EFLAGS+=-lsecur32 20 OUTFILE=bitlbee.exe 21 else 22 objects += unix.o conf.o log.o 23 OUTFILE=bitlbee 24 endif 17 25 18 26 # Expansion of variables -
bitlbee.c
rf329dfc re01ff50 127 127 global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL ); 128 128 129 #ifndef _WIN32 129 130 if( !global.conf->nofork ) 130 131 { … … 150 151 } 151 152 } 153 #endif 152 154 153 155 if( global.conf->runmode == RUNMODE_FORKDAEMON ) … … 157 159 ipc_master_listen_socket(); 158 160 161 #ifndef _WIN32 159 162 if( ( fp = fopen( global.conf->pidfile, "w" ) ) ) 160 163 { … … 166 169 log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile ); 167 170 } 171 #endif 168 172 169 173 if( !global.conf->nofork ) … … 291 295 } 292 296 297 #ifndef _WIN32 293 298 if( global.conf->runmode == RUNMODE_FORKDAEMON ) 294 299 { … … 352 357 } 353 358 else 359 #endif 354 360 { 355 361 log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket ); -
bitlbee.h
rf329dfc re01ff50 35 35 #endif 36 36 37 /* Depend on Windows 2000 for now since we need getaddrinfo() */ 38 #define _WIN32_WINNT 0x0501 39 37 40 #define PACKAGE "BitlBee" 38 41 #define BITLBEE_VERSION "3.2.2" … … 57 60 #include <ctype.h> 58 61 #include <errno.h> 62 63 #ifndef _WIN32 59 64 #include <syslog.h> 65 #endif 66 60 67 #include <glib.h> 61 68 #include <gmodule.h> -
configure
rf329dfc re01ff50 484 484 elif [ "$ssl" = "nss" ]; then 485 485 detect_nss 486 elif [ "$ssl" = "sspi" ]; then 487 echo 486 488 elif [ "$ssl" = "openssl" ]; then 487 489 echo … … 606 608 # BI == built-in 607 609 echo '#define OTR_BI' >> config.h 608 echo "EFLAGS+=-L${otrprefix}/lib -lotr -lgcrypt" >> Makefile.settings610 echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings 609 611 echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings 610 612 echo 'OTR_BI=otr.o' >> Makefile.settings … … 804 806 ;; 805 807 CYGWIN* ) 808 echo 'Cygwin is not officially supported.' 806 809 ;; 807 810 Windows ) 808 echo 'Native windows compilation is not supported anymore, use cygwin instead.'809 811 ;; 810 812 * ) -
help.c
rf329dfc re01ff50 42 42 *help = h = g_new0 ( help_t, 1 ); 43 43 44 h->fd = open( helpfile, O_RDONLY ); 44 h->fd = open( helpfile, O_RDONLY 45 #ifdef _WIN32 46 | O_BINARY 47 #endif 48 ); 45 49 46 50 if( h->fd == -1 ) -
ipc.c
rf329dfc re01ff50 28 28 #include "ipc.h" 29 29 #include "commands.h" 30 #ifndef _WIN32 30 31 #include <sys/uio.h> 31 32 #include <sys/un.h> 33 #endif 32 34 33 35 GSList *child_list = NULL; … … 841 843 } 842 844 845 #ifndef _WIN32 843 846 char *ipc_master_save_state() 844 847 { … … 939 942 return 1; 940 943 } 944 #else 945 int ipc_master_listen_socket() 946 { 947 /* FIXME: Open named pipe \\.\BITLBEE */ 948 return 0; 949 } 950 #endif 941 951 942 952 int ipc_master_load_state( char *statefile ) -
lib/events.h
rf329dfc re01ff50 37 37 38 38 #include <sys/types.h> 39 #ifndef _WIN32 39 40 #include <sys/socket.h> 40 41 #include <netdb.h> 41 42 #include <netinet/in.h> 43 #endif 42 44 #include <glib.h> 43 45 #include <gmodule.h> -
lib/events_glib.c
rf329dfc re01ff50 31 31 #include <string.h> 32 32 #include <sys/types.h> 33 #ifndef _WIN32 33 34 #include <sys/socket.h> 34 35 #include <netdb.h> … … 36 37 #include <arpa/inet.h> 37 38 #include <unistd.h> 39 #else 40 #include "sock.h" 41 #define ETIMEDOUT WSAETIMEDOUT 42 #define EINPROGRESS WSAEINPROGRESS 43 #endif 38 44 #include <fcntl.h> 39 45 #include <errno.h> -
lib/http_client.c
rf329dfc re01ff50 292 292 293 293 cleanup: 294 /* Avoid g_source_remove warnings */295 req->inpa = 0;296 297 294 if( req->ssl ) 298 295 ssl_disconnect( req->ssl ); -
lib/misc.c
rf329dfc re01ff50 420 420 void random_bytes( unsigned char *buf, int count ) 421 421 { 422 #ifndef _WIN32 422 423 static int use_dev = -1; 423 424 … … 469 470 470 471 if( !use_dev ) 472 #endif 471 473 { 472 474 int i; -
lib/proxy.c
rf329dfc re01ff50 26 26 #include <string.h> 27 27 #include <sys/types.h> 28 #ifndef _WIN32 28 29 #include <sys/socket.h> 29 30 #include <netdb.h> … … 31 32 #include <arpa/inet.h> 32 33 #include <unistd.h> 34 #else 35 #include "sock.h" 36 #define ETIMEDOUT WSAETIMEDOUT 37 #define EINPROGRESS WSAEINPROGRESS 38 #endif 33 39 #include <fcntl.h> 34 40 #include <errno.h> … … 70 76 len = sizeof(error); 71 77 78 #ifndef _WIN32 72 79 if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0 || error) { 73 80 if ((phb->gai_cur = phb->gai_cur->ai_next)) { … … 94 101 return FALSE; 95 102 } 103 #endif 96 104 freeaddrinfo(phb->gai); 97 105 sock_make_blocking(source); -
lib/proxy.h
rf329dfc re01ff50 28 28 29 29 #include <sys/types.h> 30 #ifndef _WIN32 30 31 #include <sys/socket.h> 31 32 #include <netdb.h> 32 33 #include <netinet/in.h> 34 #endif 33 35 #include <glib.h> 34 36 #include <gmodule.h> -
lib/ssl_gnutls.c
rf329dfc re01ff50 236 236 static void ssl_cache_add( struct scd *conn ) 237 237 { 238 size_t data_size = 0;238 size_t data_size; 239 239 struct ssl_session *data; 240 240 char *hostname; … … 245 245 246 246 data = g_malloc( sizeof( struct ssl_session ) + data_size ); 247 if( gnutls_session_get_data( conn->session, data->data, &data _size ) != 0 )247 if( gnutls_session_get_data( conn->session, data->data, &data->size ) != 0 ) 248 248 { 249 249 g_free( data ); … … 335 335 int st, stver; 336 336 337 /* This function returns false, so avoid calling b_event_remove again */338 conn->inpa = -1;339 340 337 if( ( st = gnutls_handshake( conn->session ) ) < 0 ) 341 338 { -
protocols/msn/soap.h
rf329dfc re01ff50 36 36 #include <string.h> 37 37 #include <sys/types.h> 38 #ifndef _WIN32 38 39 #include <sys/socket.h> 39 40 #include <netinet/in.h> 40 41 #include <arpa/inet.h> 41 42 #include <unistd.h> 43 #endif 42 44 #include "nogaim.h" 43 45 -
protocols/oscar/rxqueue.c
rf329dfc re01ff50 9 9 #include <aim.h> 10 10 11 #ifndef _WIN32 11 12 #include <sys/socket.h> 13 #endif 12 14 13 15 /* -
protocols/oscar/txqueue.c
rf329dfc re01ff50 9 9 #include "im.h" 10 10 11 #ifndef _WIN32 11 12 #include <sys/socket.h> 13 #endif 12 14 13 15 /* -
protocols/twitter/twitter.c
rf329dfc re01ff50 323 323 s = set_add(&acc->set, "show_ids", "true", set_eval_bool, acc); 324 324 325 s = set_add(&acc->set, "show_old_mentions", " 0", set_eval_int, acc);325 s = set_add(&acc->set, "show_old_mentions", "20", set_eval_int, acc); 326 326 327 327 s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc); … … 617 617 618 618 goto eof; 619 } else if ((g_strcasecmp(cmd[0], "favourite") == 0 || 620 g_strcasecmp(cmd[0], "favorite") == 0 || 621 g_strcasecmp(cmd[0], "fav") == 0) && cmd[1]) { 619 } else if (g_strcasecmp(cmd[0], "favourite") == 0 && cmd[1]) { 622 620 if ((id = twitter_message_id_from_command_arg(ic, cmd[1], NULL))) { 623 621 twitter_favourite_tweet(ic, id); -
protocols/yahoo/libyahoo2.c
rf329dfc re01ff50 48 48 */ 49 49 50 #ifndef _WIN32 50 51 #include <unistd.h> 52 #endif 51 53 #include <errno.h> 52 54 #include <stdio.h> -
protocols/yahoo/yahoo_httplib.c
rf329dfc re01ff50 38 38 39 39 #include <errno.h> 40 #ifndef _WIN32 40 41 #include <unistd.h> 42 #endif 41 43 #include <ctype.h> 42 44 #include "yahoo2.h" -
protocols/yahoo/yahoo_util.h
rf329dfc re01ff50 65 65 void y_strfreev(char **vector); 66 66 67 #ifndef _WIN32 67 68 int strncasecmp(const char *s1, const char *s2, size_t n); 68 69 int strcasecmp(const char *s1, const char *s2); … … 72 73 int snprintf(char *str, size_t size, const char *format, ...); 73 74 int vsnprintf(char *str, size_t size, const char *format, va_list ap); 75 #endif 74 76 75 77 #endif -
sock.h
rf329dfc re01ff50 2 2 #include <fcntl.h> 3 3 4 #ifndef _WIN32 4 5 #include <unistd.h> 5 6 #include <sys/socket.h> … … 11 12 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR) 12 13 void closesocket( int fd ); 14 #else 15 # include <winsock2.h> 16 # include <ws2tcpip.h> 17 # if !defined(BITLBEE_CORE) && defined(_MSC_VER) 18 # pragma comment(lib,"bitlbee.lib") 19 # endif 20 # include <io.h> 21 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); } 22 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); } 23 # define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK) 24 # define ETIMEDOUT WSAETIMEDOUT 25 # define sleep(a) Sleep(a*1000) 26 #endif
Note: See TracChangeset
for help on using the changeset viewer.