* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#ifdef _WIN32
#define _WIN32_WINNT 0x0501
#include <winsock2.h>
return SR_OK;
}
-static int scpi_tcp_open(void *priv)
+static int scpi_tcp_open(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_tcp *tcp = priv;
+ struct scpi_tcp *tcp = scpi->priv;
struct addrinfo hints;
struct addrinfo *results, *res;
int err;
{
struct scpi_tcp *tcp = priv;
int len, out;
- char *terminated_command;
- terminated_command = g_strdup_printf("%s\r\n", command);
- len = strlen(terminated_command);
- out = send(tcp->socket, terminated_command, len, 0);
- g_free(terminated_command);
+ len = strlen(command);
+ out = send(tcp->socket, command, len, 0);
if (out < 0) {
sr_err("Send error: %s", g_strerror(errno));
tcp->response_bytes_read >= tcp->response_length);
}
-static int scpi_tcp_close(void *priv)
+static int scpi_tcp_close(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_tcp *tcp = priv;
+ struct scpi_tcp *tcp = scpi->priv;
if (close(tcp->socket) < 0)
return SR_ERR;