Selaa lähdekoodia

Include checksum in a map struct.

tags/0.6.7
Vsevolod Stakhov 10 vuotta sitten
vanhempi
commit
afd507caa2
2 muutettua tiedostoa jossa 17 lisäystä ja 9 poistoa
  1. 3
    0
      src/map.c
  2. 14
    9
      src/map.h

+ 3
- 0
src/map.c Näytä tiedosto

@@ -396,6 +396,7 @@ read_http_sync (struct rspamd_map *map, struct http_map_data *data)
write_http_request (map, data, fd);

cbdata.state = 0;
cbdata.map = map;
cbdata.prev_data = *map->user_data;
cbdata.cur_data = NULL;

@@ -442,6 +443,7 @@ read_map_file (struct rspamd_map *map, struct file_map_data *data)
cbdata.state = 0;
cbdata.prev_data = *map->user_data;
cbdata.cur_data = NULL;
cbdata.map = map;

rlen = 0;
while ((r = read (fd, buf + rlen, sizeof (buf) - rlen - 1)) > 0) {
@@ -836,6 +838,7 @@ http_async_callback (gint fd, short what, void *ud)
cbd->cbdata.state = 0;
cbd->cbdata.prev_data = *cbd->map->user_data;
cbd->cbdata.cur_data = NULL;
cbd->cbdata.map = cbd->map;
cbd->data->rlen = 0;
cbd->data->chunk = 0;
cbd->data->chunk_remain = 0;

+ 14
- 9
src/map.h Näytä tiedosto

@@ -16,15 +16,6 @@ enum fetch_proto {
MAP_PROTO_HTTP,
};

/**
* Callback data for async load
*/
struct map_cb_data {
gint state;
void *prev_data;
void *cur_data;
};

/**
* Data specific to file maps
*/
@@ -49,6 +40,8 @@ struct http_map_data {
guint32 chunk_remain;
};

struct map_cb_data;

/**
* Callback types
*/
@@ -73,10 +66,22 @@ struct rspamd_map {
gchar *uri;
gchar *description;
guint32 id;
guint32 checksum;
/* Shared lock for temporary disabling of map reading (e.g. when this map is written by UI) */
gint *locked;
};

/**
* Callback data for async load
*/
struct map_cb_data {
struct rspamd_map *map;
gint state;
void *prev_data;
void *cur_data;
};


/**
* Check map protocol
*/

Loading…
Peruuta
Tallenna