fixes

Author: vvaltman

config.h.in

@@ -30,6 +30,9 @@
 /* Define to 1 if you have the `edit' library (-ledit). */
 #undef HAVE_LIBEDIT
 
+/* Define to 1 if you have the `event' library (-levent). */
+#undef HAVE_LIBEVENT
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 

configure

@@ -3424,6 +3424,51 @@ _ACEOF
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for event_base_new in -levent" >&5
+$as_echo_n "checking for event_base_new in -levent... " >&6; }
+if ${ac_cv_lib_event_event_base_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-levent  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char event_base_new ();
+int
+main ()
+{
+return event_base_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_event_event_base_new=yes
+else
+  ac_cv_lib_event_event_base_new=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_event_base_new" >&5
+$as_echo "$ac_cv_lib_event_event_base_new" >&6; }
+if test "x$ac_cv_lib_event_event_base_new" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEVENT 1
+_ACEOF
+
+  LIBS="-levent $LIBS"
+
+fi
+
 EXTRA_LIBS=""
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_save_prompt in -lreadline" >&5

configure.ac

@@ -18,6 +18,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([backtrace], [execinfo])
 AC_CHECK_LIB([z], [inflate])
 AC_CHECK_LIB([crypto], [AES_set_encrypt_key])
+AC_CHECK_LIB([event], [event_base_new])
 EXTRA_LIBS=""
 
 AC_CHECK_LIB([readline], [rl_save_prompt], 

generate.c

@@ -942,12 +942,12 @@ void usage (void) {
 void logprintf (const char *format, ...) __attribute__ ((format (printf, 1, 2)));
 void logprintf (const char *format __attribute__ ((unused)), ...) {
 }
-
+/*
 void hexdump (int *in_ptr, int *in_end) {
   int *ptr = in_ptr;
   while (ptr < in_end) { printf (" %08x", *(ptr ++)); }
   printf ("\n");
-}
+}*/
 
 #ifdef HAVE_EXECINFO_H
 void print_backtrace (void) {

interface.c

@@ -1514,13 +1514,13 @@ void print_end (void) {
   prompt_was = 0;
 }
 
-void hexdump (int *in_ptr, int *in_end) {
+/*void hexdump (int *in_ptr, int *in_end) {
   print_start ();
   int *ptr = in_ptr;
   while (ptr < in_end) { printf (" %08x", *(ptr ++)); }
   printf ("\n");
   print_end (); 
-}
+}*/
 
 void logprintf (const char *format, ...) {
   int x = 0;

interface.h

@@ -50,7 +50,7 @@ void logprintf (const char *format, ...) __attribute__ ((format (printf, 1, 2)))
   } while (0);\
 
 
-void hexdump (int *in_ptr, int *in_end);
+//void hexdump (int *in_ptr, int *in_end);
 
 struct tgl_message;
 void print_message (struct tgl_message *M);

queries.c

@@ -61,7 +61,7 @@
 #define PATH_MAX 4096
 #endif
 
-int want_dc_num;
+//int want_dc_num;
 char *get_downloads_directory (void);
 //extern int offline_mode;
 
@@ -80,7 +80,7 @@ static void out_peer_id (tgl_peer_id_t id);
 
 #define memcmp8(a,b) memcmp ((a), (b), 8)
 DEFINE_TREE (query, struct query *, memcmp8, 0) ;
-struct tree_query *queries_tree;
+static struct tree_query *queries_tree;
 
 struct query *tglq_query_get (long long id) {
   return tree_lookup_query (queries_tree, (void *)&id);
@@ -208,7 +208,7 @@ void tglq_query_error (long long id) {
 static int packed_buffer[MAX_PACKED_SIZE / 4];
 
 void tglq_query_result (long long id UU) {
-  vlogprintf (E_DEBUG, "result for query #%lld\n", id);
+  vlogprintf (E_DEBUG, "result for query #%lld. Size %ld bytes\n", id, 4 * (in_end - in_ptr));
   /*if (verbosity  >= 4) {
     logprintf ( "result: ");
     hexdump_in ();
@@ -221,6 +221,7 @@ void tglq_query_result (long long id UU) {
     int l = prefetch_strlen ();
     char *s = fetch_str (l);
     int total_out = tgl_inflate (s, l, packed_buffer, MAX_PACKED_SIZE);
+    vlogprintf (E_DEBUG, "inflated %d bytes\n", total_out);
     end = in_ptr;
     eend = in_end;
     //assert (total_out % 4 == 0);
@@ -246,6 +247,7 @@ void tglq_query_result (long long id UU) {
     if (q->methods && q->methods->on_answer) {
       if (q->methods->type) {
         int *save = in_ptr;
+        vlogprintf (E_DEBUG, "in_ptr = %p, end_ptr = %p\n", in_ptr, in_end);
         if (skip_type_any (q->methods->type) < 0) {
           vlogprintf (E_ERROR, "Skipped %ld int out of %ld (type %s)\n", in_ptr - save, in_end - save, q->methods->type->type->id);
           assert (0);
@@ -269,8 +271,8 @@ void tglq_query_result (long long id UU) {
 } 
 
 
-int max_chat_size;
-int max_bcast_size;
+//int max_chat_size;
+//int max_bcast_size;
 //int want_dc_num;
 //int new_dc_num;
 //extern struct dc *DC_list[];
@@ -337,11 +339,12 @@ static int help_get_config_on_answer (struct query *q UU) {
   for (i = 0; i < n; i++) {
     fetch_dc_option ();
   }
-  max_chat_size = fetch_int ();
+  int max_chat_size = fetch_int ();
+  int max_bcast_size = 0;
   if (op == CODE_config) {
     max_bcast_size = fetch_int ();
   }
-  vlogprintf (E_DEBUG, "chat_size = %d\n", max_chat_size);
+  vlogprintf (E_DEBUG, "chat_size = %d, bcast_size = %d\n", max_chat_size, max_bcast_size);
 
   if (q->callback) {
     ((void (*)(void *, int))(q->callback))(q->callback_extra, 1);
@@ -447,7 +450,7 @@ static struct query_methods phone_call_methods  = {
 void tgl_do_phone_call (const char *user, const char *hash,void (*callback)(void *callback_extra, int success), void *callback_extra) {
   vlogprintf (E_DEBUG, "calling user\n");
   //suser = tstrdup (user);
-  want_dc_num = 0;
+  //want_dc_num = 0;
   clear_packet ();
   tgl_do_insert_header ();
   out_int (CODE_auth_send_call);

tgl.c

@@ -60,3 +60,4 @@ int tgl_signed_dc (struct dc *DC) {
   assert (DC);
   return DC->has_auth;
 }
+

tgl.h

@@ -33,19 +33,14 @@ struct bingnum_ctx;
 #define TGL_UPDATE_ACCESS_HASH 16384
 
 struct tgl_allocator {
-  void *(*talloc)(size_t size);
-  void *(*trealloc)(void *ptr, size_t old_size, size_t size);
-  void *(*talloc0)(size_t size);
-  char *(*tstrdup)(const char *s);
-  char *(*tstrndup)(const char *s, size_t n);
-  void (*tfree)(void *ptr, int size);
-  void (*tfree_str)(void *ptr);
-  void (*tfree_secure)(void *ptr, int size);
-  int (*tasprintf)(char **res, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
-  int (*tsnprintf)(char *buf, int len, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
-  void (*tcheck)(void);
-  void (*texists)(void *ptr, int size);
+  void *(*alloc)(size_t size);
+  void *(*realloc)(void *ptr, size_t old_size, size_t size);
+  void (*free)(void *ptr, int size);
+  void (*check)(void);
+  void (*exists)(void *ptr, int size);
 };
+extern struct tgl_allocator tgl_allocator_release;
+extern struct tgl_allocator tgl_allocator_debug;
 
 struct tgl_update_callback {
   void (*new_msg)(struct tgl_message *M);