Start removing request->timestamp, now that we have

	request->received

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 4653d4c..bffc0cf 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -917,7 +917,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'd': /* request day */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%d", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -935,13 +935,13 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                break;
                        case 'l': /* request timestamp */
                                snprintf(tmpdt, sizeof(tmpdt), "%lu",
-                                        (unsigned long) request->timestamp);
+                                        (unsigned long) request->received.tv_sec);
                                strlcpy(q,tmpdt,freespace);
                                q += strlen(q);
                                p++;
                                break;
                        case 'm': /* request month */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%m", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -962,7 +962,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 't': /* request timestamp */
-                               CTIME_R(&request->timestamp, tmpdt, sizeof(tmpdt));
+                               CTIME_R(&request->received.tv_sec, tmpdt, sizeof(tmpdt));
                                nl = strchr(tmpdt, '\n');
                                if (nl) *nl = '\0';
                                strlcpy(q, tmpdt, freespace);
@@ -984,7 +984,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'D': /* request date */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%Y%m%d", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -993,7 +993,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'H': /* request hour */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%H", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -1016,7 +1016,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'S': /* request timestamp in SQL format*/
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%Y-%m-%d %H:%M:%S", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -1025,7 +1025,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'T': /* request timestamp */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%Y-%m-%d-%H.%M.%S.000000", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
@@ -1043,7 +1043,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'Y': /* request year */
-                               TM = localtime_r(&request->timestamp, &s_TM);
+                               TM = localtime_r(&request->received.tv_sec, &s_TM);
                                len = strftime(tmpdt, sizeof(tmpdt), "%Y", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);