From: pcarana <pc.moreno2099@gmail.com>
Date: Wed, 13 Mar 2019 17:51:41 +0000 (-0600)
Subject: Rename some getters (current session ID and last serial number)
X-Git-Tag: v0.0.2~52^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb9b80526f9d9f27bf3750f59369f8b74b30cc1f;p=thirdparty%2FFORT-validator.git

Rename some getters (current session ID and last serial number)
---

diff --git a/src/notify.c b/src/notify.c
index 8a5e3876..00f79637 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -12,8 +12,8 @@ send_notify(int fd, u_int8_t rtr_version)
 	u_int32_t serial;
 	u_int16_t session_id;
 
-	serial = last_serial_number();
-	session_id = current_session_id(rtr_version);
+	serial = get_last_serial_number();
+	session_id = get_current_session_id(rtr_version);
 	init_sender_common(&common, fd, rtr_version, &session_id, &serial, NULL);
 	return send_serial_notify_pdu(&common);
 }
diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c
index 26756d20..0fa677f2 100644
--- a/src/rtr/pdu_handler.c
+++ b/src/rtr/pdu_handler.c
@@ -63,11 +63,11 @@ handle_serial_query_pdu(int fd, void *pdu)
 	 * with code 0 ("Corrupt Data")"
 	 */
 	version = received->header.protocol_version;
-	session_id = current_session_id(version);
+	session_id = get_current_session_id(version);
 	if (received->header.session_id != session_id)
 		return err_pdu_send(fd, version, ERR_PDU_CORRUPT_DATA, NULL, NULL);
 
-	current_serial = last_serial_number();
+	current_serial = get_last_serial_number();
 	init_sender_common(&common, fd, version, &session_id,
 	    &received->serial_number, &current_serial);
 
@@ -114,8 +114,8 @@ handle_reset_query_pdu(int fd, void *pdu)
 	int error, updates;
 
 	version = received->header.protocol_version;
-	session_id = current_session_id(version);
-	current_serial = last_serial_number();
+	session_id = get_current_session_id(version);
+	current_serial = get_last_serial_number();
 	init_sender_common(&common, fd, version, &session_id, NULL,
 	    &current_serial);
 
diff --git a/src/vrps.c b/src/vrps.c
index 78f8f98a..69d84dad 100644
--- a/src/vrps.c
+++ b/src/vrps.c
@@ -253,13 +253,13 @@ set_vrps_last_modified_date(time_t new_date)
 }
 
 u_int32_t
-last_serial_number(void)
+get_last_serial_number(void)
 {
 	return state.current_serial - 1;
 }
 
 u_int16_t
-current_session_id(u_int8_t rtr_version)
+get_current_session_id(u_int8_t rtr_version)
 {
 	if (rtr_version == 1)
 		return state.v1_session_id;
diff --git a/src/vrps.h b/src/vrps.h
index 8b4081f5..7931e57a 100644
--- a/src/vrps.h
+++ b/src/vrps.h
@@ -40,8 +40,8 @@ void delta_destroy(struct delta *);
 void deltas_db_destroy(void);
 void set_vrps_last_modified_date(time_t);
 
-u_int32_t last_serial_number(void);
-u_int16_t current_session_id(u_int8_t);
+u_int32_t get_last_serial_number(void);
+u_int16_t get_current_session_id(u_int8_t);
 time_t get_vrps_last_modified_date(void);
 
 #endif /* SRC_VRPS_H_ */