sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DBI] Disable Change Streams with mongo Version 

Support for change stream is only available in mongoc >=1.9.0
- Disabled related functions in dbi.
Support for bson to json used in debug statement only in libbson >=1.7.0
- Simple debug message in lower versions
This commit is contained in:
jmasterfunk84 2022-10-12 11:28:15 -06:00 committed by Sukchan Lee
parent 0daef1686a
commit 8fb85db310
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/app/ogs-context.c
View File

@ -352,8 +352,12 @@ int ogs_app_context_parse_config(void)
ogs_yaml_iter_bool(&parameter_iter); ogs_yaml_iter_bool(&parameter_iter);
} else if (!strcmp(parameter_key, } else if (!strcmp(parameter_key,
"use_mongodb_change_stream")) { "use_mongodb_change_stream")) {
#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 9
self.use_mongodb_change_stream = self.use_mongodb_change_stream =
ogs_yaml_iter_bool(&parameter_iter); ogs_yaml_iter_bool(&parameter_iter);
#else
self.use_mongodb_change_stream = false;
#endif
} else } else
ogs_warn("unknown key `%s`", parameter_key); ogs_warn("unknown key `%s`", parameter_key);
} }

10
lib/dbi/ogs-mongoc.c
View File

@ -182,15 +182,18 @@ void ogs_dbi_final()
mongoc_collection_destroy(self.collection.subscriber); mongoc_collection_destroy(self.collection.subscriber);
} }
#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 9
if (self.stream) { if (self.stream) {
mongoc_change_stream_destroy(self.stream); mongoc_change_stream_destroy(self.stream);
} }
#endif
ogs_mongoc_final(); ogs_mongoc_final();
} }
int ogs_dbi_collection_watch_init(void) int ogs_dbi_collection_watch_init(void)
{ {
#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 9
bson_t empty = BSON_INITIALIZER; bson_t empty = BSON_INITIALIZER;
const bson_t *err_doc; const bson_t *err_doc;
bson_error_t error; bson_error_t error;
@ -213,10 +216,14 @@ int ogs_dbi_collection_watch_init(void)
} }
return OGS_OK; return OGS_OK;
# else
return OGS_ERROR;
#endif
} }
int ogs_dbi_poll_change_stream(void) int ogs_dbi_poll_change_stream(void)
{ {
#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 9
int rv; int rv;
const bson_t *document; const bson_t *document;
@ -240,4 +247,7 @@ int ogs_dbi_poll_change_stream(void)
} }
return OGS_OK; return OGS_OK;
# else
return OGS_ERROR;
#endif
} }

2
lib/dbi/ogs-mongoc.h
View File

@ -37,7 +37,9 @@ typedef struct ogs_mongoc_s {
void *client; void *client;
void *database; void *database;
#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 9
mongoc_change_stream_t *stream; mongoc_change_stream_t *stream;
#endif
char *masked_db_uri; char *masked_db_uri;

9
src/hss/hss-context.c
View File

@ -1201,8 +1201,13 @@ int hss_handle_change_event(const bson_t *document)
char *imsi_bcd; char *imsi_bcd;
#if BSON_MAJOR_VERSION >= 1 && BSON_MINOR_VERSION >= 7
char *as_json = bson_as_relaxed_extended_json(document, NULL); char *as_json = bson_as_relaxed_extended_json(document, NULL);
ogs_debug("Got document: %s\n", as_json); ogs_debug("Received change stream document: %s\n", as_json);
bson_free (as_json);
# else
ogs_debug("Received change stream document.");
#endif
if (!bson_iter_init_find(&iter, document, "fullDocument")) { if (!bson_iter_init_find(&iter, document, "fullDocument")) {
ogs_error("No 'imsi' field in this document."); ogs_error("No 'imsi' field in this document.");
return OGS_ERROR; return OGS_ERROR;
@ -1276,8 +1281,6 @@ int hss_handle_change_event(const bson_t *document)
ogs_debug("No 'updateDescription' field in this document"); ogs_debug("No 'updateDescription' field in this document");
} }
bson_free (as_json);
if (send_clr_flag) { if (send_clr_flag) {
ogs_info("[%s] Cancel Location Requested", imsi_bcd); ogs_info("[%s] Cancel Location Requested", imsi_bcd);
hss_s6a_send_clr(imsi_bcd, NULL, NULL, hss_s6a_send_clr(imsi_bcd, NULL, NULL,