From f5270cc9bdc68b4da8cc8a6539b29c506b1c7a50 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 9 Apr 2010 13:30:56 -0500
Subject: [PATCH] ppp: Use pppcp_signal functions directly

No real need to wrap them behind lcp_ functions
---
 gatchat/gatppp.c  | 11 ++++++-----
 gatchat/ppp.h     |  3 ---
 gatchat/ppp_lcp.c | 27 ---------------------------
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/gatchat/gatppp.c b/gatchat/gatppp.c
index 0215649a..4f8d8f0c 100644
--- a/gatchat/gatppp.c
+++ b/gatchat/gatppp.c
@@ -386,8 +386,8 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
 
 	switch (phase) {
 	case PPP_ESTABLISHMENT:
-		/* signal UP event to LCP */
-		lcp_establish(ppp->lcp);
+		/* send an UP event to the lcp layer */
+		pppcp_signal_up(ppp->lcp);
 		break;
 	case PPP_AUTHENTICATION:
 		/* we don't do authentication right now, so send NONE */
@@ -396,7 +396,8 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
 		/* otherwise we need to wait for the peer to send us a challenge */
 		break;
 	case PPP_TERMINATION:
-		lcp_terminate(ppp->lcp);
+		/* send a CLOSE event to the lcp layer */
+		pppcp_signal_close(ppp->lcp);
 		break;
 	case PPP_DEAD:
 		ppp_dead(ppp);
@@ -497,8 +498,8 @@ gboolean ppp_get_acfc(GAtPPP *ppp)
 /* Administrative Open */
 void g_at_ppp_open(GAtPPP *ppp)
 {
-	/* send an OPEN event to the lcp layer */
-	lcp_open(ppp->lcp);
+	/* send an open event to the lcp layer */
+	pppcp_signal_open(ppp->lcp);
 }
 
 void g_at_ppp_set_credentials(GAtPPP *ppp, const char *username,
diff --git a/gatchat/ppp.h b/gatchat/ppp.h
index 03540500..ccbd80d6 100644
--- a/gatchat/ppp.h
+++ b/gatchat/ppp.h
@@ -101,9 +101,6 @@ void ppp_set_acfc(GAtPPP *ppp, gboolean acfc);
 gboolean ppp_get_acfc(GAtPPP *ppp);
 struct pppcp_data * lcp_new(GAtPPP *ppp);
 void lcp_free(struct pppcp_data *lcp);
-void lcp_open(struct pppcp_data *data);
-void lcp_establish(struct pppcp_data *data);
-void lcp_terminate(struct pppcp_data *data);
 void lcp_protocol_reject(struct pppcp_data *lcp, guint8 *packet, gsize len);
 void auth_process_packet(struct auth_data *data, guint8 *new_packet);
 void auth_set_credentials(struct auth_data *data, const char *username,
diff --git a/gatchat/ppp_lcp.c b/gatchat/ppp_lcp.c
index a384a0db..304a72c2 100644
--- a/gatchat/ppp_lcp.c
+++ b/gatchat/ppp_lcp.c
@@ -230,33 +230,6 @@ struct pppcp_proto lcp_proto = {
 	.rcr			= lcp_rcr,
 };
 
-void lcp_open(struct pppcp_data *data)
-{
-	if (data == NULL)
-		return;
-
-	/* send an open event to the lcp layer */
-	pppcp_signal_open(data);
-}
-
-void lcp_establish(struct pppcp_data *data)
-{
-	if (data == NULL)
-		return;
-
-	/* send an UP event to the lcp layer */
-	pppcp_signal_up(data);
-}
-
-void lcp_terminate(struct pppcp_data *data)
-{
-	if (data == NULL)
-		return;
-
-	/* send a CLOSE event to the lcp layer */
-	pppcp_signal_close(data);
-}
-
 void lcp_free(struct pppcp_data *pppcp)
 {
 	struct ipcp_data *lcp = pppcp_get_data(pppcp);