-/* File: report.c */
+/*!
+ * @file report.c
+ * @brief スコアサーバ転送機能の実装
+ * @date 2014/07/14
+ * @author Hengband Team
+ */
-#define _GNU_SOURCE
+#define _GNU_SOURCE /*!< 未使用*/
#include "angband.h"
+#include "util.h"
+
+#include "floor.h"
+#include "player-status.h"
+#include "files.h"
#ifdef WORLD_SCORE
#include <signal.h>
#endif
+/*
+ * internet resource value
+ */
+#define HTTP_PROXY "" /*!< デフォルトのプロキシURL / Default proxy url */
+#define HTTP_PROXY_PORT 0 /*!< デフォルトのプロキシポート / Default proxy port */
+#define HTTP_TIMEOUT 20 /*!< デフォルトのタイムアウト時間(秒) / Timeout length (second) */
+#define SCORE_SERVER "hengband.osdn.jp" /*!< デフォルトのスコアサーバURL / Default score server url */
+#define SCORE_PORT 80 /*!< デフォルトのスコアサーバポート / Default score server port */
+
#ifdef JP
-#define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/hengscore/score.cgi"
+#define SCORE_PATH "http://hengband.osdn.jp/score/register_score.php" /*!< スコア開示URL */
#else
-#define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/hengscore-en/score.cgi"
+#define SCORE_PATH "http://moon.kmc.gr.jp/hengband/hengscore-en/score.cgi" /*!< スコア開示URL */
#endif
/* for debug */
#if 0
-#define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/scoretest/score.cgi"
+#define SCORE_PATH "http://moon.kmc.gr.jp/hengband/scoretest/score.cgi" /*!< スコア開示URL */
#endif
/*
* simple buffer library
*/
-
typedef struct {
size_t max_size;
size_t size;
char *data;
} BUF;
-#define BUFSIZE (65536)
-
-#ifndef HAVE_VASPRINTF
-#define vasprintf Vasprintf
-
-static int Vasprintf(char **buf, const char *fmt, va_list ap)
-{
- int ret;
-
- *buf = malloc(1024);
-
-#if defined(HAVE_VSNPRINTF)
- ret = vsnprintf(*buf, 1024, fmt, ap);
-#else
- ret = vsprintf(*buf, fmt, ap);
-#endif
- return ret;
-}
-
-#endif /* ifndef HAVE_VASPRINTF */
+#define BUFSIZE (65536) /*!< スコアサーバ転送バッファサイズ */
+/*!
+ * @brief 転送用バッファの確保
+ * @return 確保したバッファの参照ポインタ
+ */
static BUF* buf_new(void)
{
BUF *p;
return p;
}
+/*!
+ * @brief 転送用バッファの解放
+ * @param b 解放するバッファの参照ポインタ
+ */
static void buf_delete(BUF *b)
{
free(b->data);
free(b);
}
-static int buf_append(BUF *buf, const char *data, size_t size)
+/*!
+ * @brief 転送用バッファにデータを追加する
+ * @param buf 追加先バッファの参照ポインタ
+ * @param data 追加元データ
+ * @param size 追加サイズ
+ * @return 追加後のバッファ容量
+ */
+static int buf_append(BUF *buf, concptr data, size_t size)
{
while (buf->size + size > buf->max_size)
{
return buf->size;
}
-static int buf_sprintf(BUF *buf, const char *fmt, ...)
+/*!
+ * @brief 転送用バッファにフォーマット指定した文字列データを追加する
+ * @param buf 追加先バッファの参照ポインタ
+ * @param fmt 文字列フォーマット
+ * @return 追加後のバッファ容量
+ */
+static int buf_sprintf(BUF *buf, concptr fmt, ...)
{
int ret;
- char *tmpbuf;
+ char tmpbuf[8192];
va_list ap;
va_start(ap, fmt);
- vasprintf(&tmpbuf, fmt, ap);
+#if defined(HAVE_VSNPRINTF)
+ ret = vsnprintf(tmpbuf, sizeof(tmpbuf), fmt, ap);
+#else
+ ret = vsprintf(tmpbuf, fmt, ap);
+#endif
va_end(ap);
- if(!tmpbuf) return -1;
+ if (ret < 0) return -1;
-#ifdef MAC_MPW
+#if ('\r' == 0x0a && '\n' == 0x0d)
{
- /* '\n' is 0x0D and '\r' is 0x0A in MPW. Swap back these. */
+ /*
+ * Originally '\r'= CR (= 0x0d) and '\n'= LF (= 0x0a)
+ * But for MPW (Macintosh Programers Workbench), these
+ * are reversed so that '\r'=LF and '\n'=CR unless the
+ * -noMapCR option is not defined.
+ *
+ * We need to swap back these here since the score
+ * dump text should be written using LF as the end of
+ * line.
+ */
char *ptr;
for (ptr = tmpbuf; *ptr; ptr++)
- if ('\n' == *ptr) *ptr = '\r';
+ {
+ if (0x0d == *ptr) *ptr = 0x0a;
+ }
}
#endif
ret = buf_append(buf, tmpbuf, strlen(tmpbuf));
- free(tmpbuf);
-
return ret;
}
return buf->size;
}
-static int buf_search(BUF *buf, const char *str)
+static int buf_search(BUF *buf, concptr str)
{
char *ret;
- ret = strstr(buf->data, str);
+ ret = my_strstr(buf->data, str);
if (!ret) return -1;
}
#endif
-static void http_post(int sd, cptr url, BUF *buf)
+/*!
+ * @brief HTTPによるダンプ内容伝送
+ * @param sd ソケットID
+ * @param url 伝送先URL
+ * @param buf 伝送内容バッファ
+ * @return なし
+ */
+static bool http_post(int sd, concptr url, BUF *buf)
{
BUF *output;
+ char response_buf[1024] = "";
+ concptr HTTP_RESPONSE_CODE_OK = "HTTP/1.1 200 OK";
output = buf_new();
- buf_sprintf(output, "POST %s HTTP/1.0\n", url);
- buf_sprintf(output, "User-Agent: Hengband %d.%d.%d\n",
+ buf_sprintf(output, "POST %s HTTP/1.0\r\n", url);
+ buf_sprintf(output, "User-Agent: Hengband %d.%d.%d\r\n",
FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
- buf_sprintf(output, "Content-Length: %d\n", buf->size);
- buf_sprintf(output, "Content-Encoding: binary\n");
- buf_sprintf(output, "Content-Type: application/octet-stream\n");
- buf_sprintf(output, "\n");
+ buf_sprintf(output, "Content-Length: %d\r\n", buf->size);
+ buf_sprintf(output, "Content-Encoding: binary\r\n");
+#ifdef JP
+#ifdef SJIS
+ buf_sprintf(output, "Content-Type: text/plain; charset=SHIFT_JIS\r\n");
+#endif
+#ifdef EUC
+ buf_sprintf(output, "Content-Type: text/plain; charset=EUC-JP\r\n");
+#endif
+#else
+ buf_sprintf(output, "Content-Type: text/plain; charset=ASCII\r\n");
+#endif
+ buf_sprintf(output, "\r\n");
buf_append(output, buf->data, buf->size);
soc_write(sd, output->data, output->size);
-}
+ soc_read(sd, response_buf, sizeof(response_buf));
+
+ return strncmp(response_buf, HTTP_RESPONSE_CODE_OK, strlen(HTTP_RESPONSE_CODE_OK)) == 0;
+}
-/* ¥¥ã¥é¥¯¥¿¥À¥ó¥×¤òºî¤Ã¤Æ BUF¤ËÊݸ */
+/*!
+ * @brief キャラクタダンプを作って BUFに保存
+ * @param dumpbuf 伝送内容バッファ
+ * @return エラーコード
+ */
static errr make_dump(BUF* dumpbuf)
{
char buf[1024];
FILE *fff;
- char file_name[1024];
+ GAME_TEXT file_name[1024];
/* Open a new file */
fff = my_fopen_temp(file_name, 1024);
if (!fff)
{
#ifdef JP
- msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
+ msg_format("一時ファイル %s を作成できませんでした。", file_name);
#else
msg_format("Failed to create temporary file %s.", file_name);
#endif
return 1;
}
- /* °ìö°ì»þ¥Õ¥¡¥¤¥ë¤òºî¤ë¡£Ä̾ï¤Î¥À¥ó¥×½ÐÎϤȶ¦Ä̲½¤¹¤ë¤¿¤á¡£ */
+ /* 一旦一時ファイルを作る。通常のダンプ出力と共通化するため。 */
(void)make_character_dump(fff);
-
- /* Close the file */
my_fclose(fff);
/* Open for read */
{
(void)buf_sprintf(dumpbuf, "%s", buf);
}
-
- /* Close the file */
my_fclose(fff);
-
- /* Remove the file */
fd_kill(file_name);
/* Success */
return (0);
}
-/*
- * Make screen dump to buffer
+/*!
+ * @brief スクリーンダンプを作成する/ Make screen dump to buffer
+ * @return 作成したスクリーンダンプの参照ポインタ
*/
-cptr make_screen_dump(void)
+concptr make_screen_dump(void)
{
BUF *screen_buf;
int y, x, i;
- cptr ret;
+ concptr ret;
- byte a = 0, old_a = 0;
- char c = ' ';
+ TERM_COLOR a = 0, old_a = 0;
+ SYMBOL_CODE c = ' ';
- static cptr html_head[] = {
+ static concptr html_head[] = {
"<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
"<pre>",
0,
};
- static cptr html_foot[] = {
+ static concptr html_foot[] = {
"</pre>\n",
"</body>\n</html>\n",
0,
if (old_use_graphics)
{
+ /* Clear -more- prompt first */
+ msg_print(NULL);
+
use_graphics = FALSE;
reset_visuals();
- /* Redraw everything */
p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
- /* Hack -- update */
handle_stuff();
}
for (x = 0; x < wid - 1; x++)
{
int rv, gv, bv;
- cptr cc = NULL;
+ concptr cc = NULL;
/* Get the attr/char */
(void)(Term_what(x, y, &a, &c));
case '&': cc = "&"; break;
case '<': cc = "<"; break;
case '>': cc = ">"; break;
+ case '"': cc = """; break;
+ case '\'': cc = "'"; break;
#ifdef WINDOWS
case 0x1f: c = '.'; break;
case 0x7f: c = (a == 0x09) ? '%' : '#'; break;
buf_sprintf(screen_buf, html_foot[i]);
/* Screen dump size is too big ? */
- if (screen_buf->size + 1> SCREEN_BUF_SIZE)
+ if (screen_buf->size + 1> SCREEN_BUF_MAX_SIZE)
{
ret = NULL;
}
use_graphics = TRUE;
reset_visuals();
- /* Redraw everything */
p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
- /* Hack -- update */
handle_stuff();
}
return ret;
}
-
+/*!
+ * @brief スコア転送処理のメインルーチン
+ * @return エラーコード
+ */
errr report_score(void)
{
#ifdef MACINTOSH
score = buf_new();
#ifdef JP
- sprintf(seikakutmp, "%s%s", ap_ptr->title, (ap_ptr->no ? "¤Î" : ""));
+ sprintf(seikakutmp, "%s%s", ap_ptr->title, (ap_ptr->no ? "の" : ""));
#else
sprintf(seikakutmp, "%s ", ap_ptr->title);
#endif
- buf_sprintf(score, "name: %s\n", player_name);
+ buf_sprintf(score, "name: %s\n", p_ptr->name);
#ifdef JP
- buf_sprintf(score, "version: ÊѶòÈÚÅÜ %d.%d.%d\n",
+ buf_sprintf(score, "version: 変愚蛮怒 %d.%d.%d\n",
FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#else
buf_sprintf(score, "version: Hengband %d.%d.%d\n",
FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#endif
- buf_sprintf(score, "score: %d\n", total_points());
+ buf_sprintf(score, "score: %d\n", calc_score());
buf_sprintf(score, "level: %d\n", p_ptr->lev);
- buf_sprintf(score, "depth: %d\n", dun_level);
+ buf_sprintf(score, "depth: %d\n", current_floor_ptr->dun_level);
buf_sprintf(score, "maxlv: %d\n", p_ptr->max_plv);
buf_sprintf(score, "maxdp: %d\n", max_dlv[DUNGEON_ANGBAND]);
buf_sprintf(score, "au: %d\n", p_ptr->au);
- buf_sprintf(score, "turns: %d\n", turn_real(turn));
+ buf_sprintf(score, "turns: %d\n", turn_real(current_world_ptr->game_turn));
buf_sprintf(score, "sex: %d\n", p_ptr->psex);
buf_sprintf(score, "race: %s\n", rp_ptr->title);
buf_sprintf(score, "class: %s\n", cp_ptr->title);
{
char buff[160];
#ifdef JP
- prt("ÀܳÃæ...", 0, 0);
+ prt("接続中...", 0, 0);
#else
prt("connecting...", 0, 0);
#endif
Term_fresh();
- sd = connect_scoreserver();
- if (!(sd < 0)) break;
+ /* プロキシを設定する */
+ set_proxy(HTTP_PROXY, HTTP_PROXY_PORT);
+
+ /* Connect to the score server */
+ sd = connect_server(HTTP_TIMEOUT, SCORE_SERVER, SCORE_PORT);
+
+
+ if (sd < 0) {
#ifdef JP
- sprintf(buff, "¥¹¥³¥¢¡¦¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£(%s)", soc_err());
+ sprintf(buff, "スコア・サーバへの接続に失敗しました。(%s)", soc_err());
#else
- sprintf(buff, "Failed to connect to the score server.(%s)", soc_err());
+ sprintf(buff, "Failed to connect to the score server.(%s)", soc_err());
#endif
- prt(buff, 0, 0);
- (void)inkey();
-
+ prt(buff, 0, 0);
+ (void)inkey();
+
#ifdef JP
- if (!get_check_strict("¤â¤¦°ìÅÙÀܳ¤ò»î¤ß¤Þ¤¹¤«? ", CHECK_NO_HISTORY))
+ if (!get_check_strict("もう一度接続を試みますか? ", CHECK_NO_HISTORY))
#else
- if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
+ if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
#endif
- {
- err = 1;
- goto report_end;
+ {
+ err = 1;
+ goto report_end;
+ }
+
+ continue;
}
- }
+
+#ifdef JP
+ prt("スコア送信中...", 0, 0);
+#else
+ prt("Sending the score...", 0, 0);
+#endif
+ Term_fresh();
+
+ if (!http_post(sd, SCORE_PATH, score)) {
+ disconnect_server(sd);
+#ifdef JP
+ sprintf(buff, "スコア・サーバへの送信に失敗しました。");
+#else
+ sprintf(buff, "Failed to send to the score server.");
+#endif
+ prt(buff, 0, 0);
+ (void)inkey();
+
#ifdef JP
- prt("¥¹¥³¥¢Á÷¿®Ãæ...", 0, 0);
+ if (!get_check_strict("もう一度接続を試みますか? ", CHECK_NO_HISTORY))
#else
- prt("Sending the score...", 0, 0);
+ if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
#endif
- Term_fresh();
- http_post(sd, SCORE_PATH, score);
+ {
+ err = 1;
+ goto report_end;
+ }
+
+ continue;
+ }
+
+ disconnect_server(sd);
+ break;
+ }
- disconnect_server(sd);
report_end:
#ifdef WINDOWS
WSACleanup();