diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2015-11-26 22:19:22 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2015-12-03 11:40:15 +0100 |
| commit | ba9e9f63bce9a868b8b3e15adca616ac4dec9414 (patch) | |
| tree | 4ae7ceb561d0dd7e0654076d1fdd42b8284d6f5d /openbsc/include/openbsc | |
| parent | 8d1ffbd3ba44939612d453b161dd86ba8302d0c1 (diff) | |
gtphub: implement restart counter properly.
Force passing a restart counter, by adding such arg to gtphub_start() (test
suite is not affected by this).
In gtphub_main.c, add -r,--restart-file <path> and next_restart_count() to
maintain the counter file. While at it, tweak the cmdline help to unify the
formatting (mostly commas and a missing line break).
Send gtphub's own restart counter. So far, the sender's restart counter was
copied through, which would break as soon as more than one GSN would talk to
the same peer with differing restart counters.
Also fix the in-mem restart counter data type (one octet, not two).
Sponsored-by: On-Waves ehi
Diffstat (limited to 'openbsc/include/openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gtphub.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/include/openbsc/gtphub.h b/openbsc/include/openbsc/gtphub.h index 5db6f6430..cc204ef7e 100644 --- a/openbsc/include/openbsc/gtphub.h +++ b/openbsc/include/openbsc/gtphub.h @@ -451,7 +451,7 @@ struct gtphub { struct expiry expire_quickly; struct expiry expire_slowly; - uint16_t restart_counter; + uint8_t restart_counter; }; struct gtp_packet_desc; @@ -463,7 +463,8 @@ int gtphub_vty_init(struct gtphub *global_hub, struct gtphub_cfg *global_cfg); int gtphub_cfg_read(struct gtphub_cfg *cfg, const char *config_file); /* Initialize and start gtphub: bind to ports, run expiry timers. */ -int gtphub_start(struct gtphub *hub, struct gtphub_cfg *cfg); +int gtphub_start(struct gtphub *hub, struct gtphub_cfg *cfg, + uint8_t restart_counter); /* Close all sockets, expire all maps and peers and free all allocations. The * struct is then unusable, unless gtphub_start() is run on it again. */ |