<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17156">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Add new osmo-remsim-client-shell binary<br><br>This is a remsim-client with an interactive 'shell', where the user<br>can type in C-APDUs in hex formats, which will be sent to the bankd /<br>SIM-card. Responses received from SIM Card via bankd will be printed<br>in return.<br><br>Change-Id: I636505fd9741833ccf5cbd1bcac30f7b9aa94425<br>---<br>M src/client/Makefile.am<br>M src/client/client.h<br>M src/client/remsim_client.c<br>M src/client/simtrace2-remsim_client.c<br>A src/client/user_shell.c<br>5 files changed, 182 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/56/17156/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/Makefile.am b/src/client/Makefile.am</span><br><span>index 3d4f355..ec99818 100644</span><br><span>--- a/src/client/Makefile.am</span><br><span>+++ b/src/client/Makefile.am</span><br><span>@@ -4,10 +4,11 @@</span><br><span> $(OSMOSIMTRACE2_CFLAGS) \</span><br><span> -I$(top_srcdir)/include/osmocom/rspro</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = osmo-remsim-client-st2 remsim-client</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-client-st2 osmo-remsim-client-shell</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim_client_SOURCES = remsim_client.c ../rspro_client_fsm.c ../debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_client_shell_SOURCES = user_shell.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ remsim_client.c ../rspro_client_fsm.c ../debug.c</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span> </span><br><span> osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \</span><br><span>diff --git a/src/client/client.h b/src/client/client.h</span><br><span>index 7cc7ec1..b3001ee 100644</span><br><span>--- a/src/client/client.h</span><br><span>+++ b/src/client/client.h</span><br><span>@@ -56,3 +56,10 @@</span><br><span> struct client_config *cfg;</span><br><span> struct cardem_inst *cardem;</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct bankd_client *g_client;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern int client_user_bankd_handle_rx(struct rspro_server_conn *bankdc, const RsproPDU_t *pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern int client_user_main(struct bankd_client *g_client);</span><br><span>diff --git a/src/client/remsim_client.c b/src/client/remsim_client.c</span><br><span>index 41361c0..dbe983b 100644</span><br><span>--- a/src/client/remsim_client.c</span><br><span>+++ b/src/client/remsim_client.c</span><br><span>@@ -52,6 +52,7 @@</span><br><span> break;</span><br><span> case RsproPDUchoice_PR_tpduCardToModem:</span><br><span> case RsproPDUchoice_PR_setAtrReq:</span><br><span style="color: hsl(120, 100%, 40%);">+ return client_user_bankd_handle_rx(bankdc, pdu);</span><br><span> default:</span><br><span> LOGPFSML(bankdc->fi, LOGL_ERROR, "Unknown/Unsupported RSPRO PDU %s\n",</span><br><span> rspro_msgt_name(pdu));</span><br><span>@@ -61,7 +62,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct bankd_client *g_client;</span><br><span style="color: hsl(120, 100%, 40%);">+struct bankd_client *g_client;</span><br><span> static void *g_tall_ctx;</span><br><span> void __thread *talloc_asn1_ctx;</span><br><span> int asn_debug;</span><br><span>@@ -161,7 +162,7 @@</span><br><span> g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span> g_client->srv_conn.clslot->clientId = atoi(optarg);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 's':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'n':</span><br><span> if (!g_client->srv_conn.clslot)</span><br><span> g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span> g_client->srv_conn.clslot->slotNr = atoi(optarg);</span><br><span>@@ -185,6 +186,7 @@</span><br><span> </span><br><span> g_client = talloc_zero(g_tall_ctx, struct bankd_client);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* create and [attempt to] establish connection to remsim-server */</span><br><span> srvc = &g_client->srv_conn;</span><br><span> srvc->server_host = "localhost";</span><br><span> srvc->server_port = 9998;</span><br><span>@@ -208,6 +210,11 @@</span><br><span> asn_debug = 0;</span><br><span> </span><br><span> bankdc = &g_client->bankd_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (srvc->clslot) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bankdc->clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bankdc->clslot = *srvc->clslot;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* server_host / server_port are configured from remsim-server */</span><br><span> bankdc->handle_rx = bankd_handle_rx;</span><br><span> memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id));</span><br><span>@@ -216,8 +223,7 @@</span><br><span> fprintf(stderr, "Unable to connect bankd conn FSM: %s\n", strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_update_id(bankdc->fi, "bankd");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_select_main(0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ client_user_main(g_client);</span><br><span> }</span><br><span>diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c</span><br><span>index ce8ea1d..bee8fc9 100644</span><br><span>--- a/src/client/simtrace2-remsim_client.c</span><br><span>+++ b/src/client/simtrace2-remsim_client.c</span><br><span>@@ -94,7 +94,7 @@</span><br><span> /* global GSMTAP instance */</span><br><span> static struct gsmtap_inst *g_gti;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct bankd_client *g_client;</span><br><span style="color: hsl(120, 100%, 40%);">+struct bankd_client *g_client;</span><br><span> static void *g_tall_ctx;</span><br><span> void __thread *talloc_asn1_ctx;</span><br><span> int asn_debug;</span><br><span>diff --git a/src/client/user_shell.c b/src/client/user_shell.c</span><br><span>new file mode 100644</span><br><span>index 0000000..db36aab</span><br><span>--- /dev/null</span><br><span>+++ b/src/client/user_shell.c</span><br><span>@@ -0,0 +1,159 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/select.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* This is a remsim-client with an interactive 'shell', where the user</span><br><span style="color: hsl(120, 100%, 40%);">+ * can type in C-APDUs in hex formats, which will be sent to the bankd /</span><br><span style="color: hsl(120, 100%, 40%);">+ * SIM-card. Responses received from SIM Card via bankd will be printed</span><br><span style="color: hsl(120, 100%, 40%);">+ * in return. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/***********************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * Incoming RSPRO messages from bank-daemon (SIM card)</span><br><span style="color: hsl(120, 100%, 40%);">+ ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int bankd_handle_tpduCardToModem(struct bankd_client *bc, const RsproPDU_t *pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(RsproPDUchoice_PR_tpduCardToModem == pdu->msg.present);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct TpduCardToModem *card2modem = &pdu->msg.choice.tpduCardToModem;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("R-APDU: %s\n", osmo_hexdump(card2modem->data.buf, card2modem->data.size));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int bankd_handle_setAtrReq(struct bankd_client *bc, const RsproPDU_t *pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ RsproPDU_t *resp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(RsproPDUchoice_PR_setAtrReq == pdu->msg.present);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("SET_ATR: %s\n", osmo_hexdump(pdu->msg.choice.setAtrReq.atr.buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->msg.choice.setAtrReq.atr.size));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = rspro_gen_SetAtrRes(ResultCode_ok);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!resp)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ server_conn_send_rspro(&bc->bankd_conn, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int client_user_bankd_handle_rx(struct rspro_server_conn *bankdc, const RsproPDU_t *pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdu->msg.present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case RsproPDUchoice_PR_tpduCardToModem:</span><br><span style="color: hsl(120, 100%, 40%);">+ bankd_handle_tpduCardToModem(g_client, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RsproPDUchoice_PR_setAtrReq:</span><br><span style="color: hsl(120, 100%, 40%);">+ bankd_handle_setAtrReq(g_client, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/***********************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * Incoming command from the user application (stdin shell in our case)</span><br><span style="color: hsl(120, 100%, 40%);">+ ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct stdin_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *rx_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* called every time a command on stdin was received */</span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_stdin_command(struct stdin_state *ss, char *cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ RsproPDU_t *pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ BankSlot_t bslot;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf[1024];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bank_slot2rspro(&bslot, &g_client->bankd_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ss->rx_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("stdin: `%s'\n", cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcasecmp(cmd, "RESET")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset the [remote] card */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu = rspro_gen_ClientSlotStatusInd(g_client->srv_conn.clslot, &bslot,</span><br><span style="color: hsl(120, 100%, 40%);">+ true, false, false, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ server_conn_send_rspro(&g_client->bankd_conn, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we assume the user has entered a C-APDU as hex string. parse + send */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_hexparse(cmd, buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "ERROR parsing C-APDU `%s'!\n", cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_client->srv_conn.clslot) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Cannot send command; no client slot\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send CMD APDU to [remote] card */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu = rspro_gen_TpduModem2Card(g_client->srv_conn.clslot, &bslot, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ server_conn_send_rspro(&g_client->bankd_conn, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* call-back function for stdin read. Gather bytes in buffer until CR/LF received */</span><br><span style="color: hsl(120, 100%, 40%);">+static int stdin_fd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stdin_state *ss = ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *cur;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(what & OSMO_FD_READ);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ss->rx_msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ss->rx_msg = msgb_alloc(1024, "stdin");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ss->rx_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cur = (char *) ss->rx_msg->tail;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = read(ofd->fd, cur, msgb_tailroom(ss->rx_msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(ss->rx_msg, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < rc; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cur[i] == '\r' || cur[i] == '\n') {</span><br><span style="color: hsl(120, 100%, 40%);">+ cur[i] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ /* dispatch the command */</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_stdin_command(ss, cur);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: possibly other commands */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(ss->rx_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ss->rx_msg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* main function */</span><br><span style="color: hsl(120, 100%, 40%);">+int client_user_main(struct bankd_client *g_client)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stdin_state ss;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* register stdin file descriptor with osmocom select loop abstraction */</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&ss, 0, sizeof(ss));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&ss.ofd, fileno(stdin), OSMO_FD_READ, &stdin_fd_cb, &ss, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_register(&ss.ofd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_select_main(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17156">change 17156</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-remsim/+/17156"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I636505fd9741833ccf5cbd1bcac30f7b9aa94425 </div>
<div style="display:none"> Gerrit-Change-Number: 17156 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>